diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index a0a0fc040a262..3441cf6b5d52a 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -304,11 +304,6 @@ var WidgetInstance = {
     },
     displayPageGroup : function(container, additional) {
         container = $(container);
-        if (!container) {
-//            if (activePageGroupId = this.activePageGroups.get(container.up('div.page_group_container').id)) {
-//                this.hideBlockContainer(activePageGroupId);
-//            }
-        }
         if (!additional) {
             additional = {};
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
index 8c30ef875c288..b7db294eedfbe 100644
--- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
@@ -117,7 +117,6 @@ public function testSave()
             ],
         ];
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
-//        $quote->load('test_order_item_with_message', 'reserved_order_id');
         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
         /** @var  \Magento\GiftMessage\Model\Message $message */
         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
index 4b821b118f999..d4df57fbff89e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
@@ -144,7 +144,6 @@ public function testSave()
             ],
         ];
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
-//        $quote->load('test_order_item_with_message', 'reserved_order_id');
         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
         /** @var  \Magento\GiftMessage\Model\Message $message */
         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
@@ -193,7 +192,6 @@ public function testSaveForMyCart()
             ],
         ];
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
-//        $quote->load('test_order_item_with_message', 'reserved_order_id');
         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
         /** @var  \Magento\GiftMessage\Model\Message $message */
         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
index aef162d92b1c1..45bae261bb617 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
@@ -38,7 +38,6 @@ public function testInvoke()
         $orderCollection = $this->objectManager->get(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
         $order = $orderCollection->getFirstItem();
 
-//        $order = $this->objectManager->create('Magento\Sales\Model\Order')->loadByIncrementId('100000001');
         /** @var \Magento\Sales\Model\Order\Item $orderItem */
         $orderItem = current($order->getAllItems());
         $items = [
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
index 4c183ad6368cc..73ced4d5462cc 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
@@ -12,14 +12,4 @@
 );
 $wishlist->loadByCustomerId($customer->getId(), true);
 $item = $wishlist->addNewItem($product, new \Magento\Framework\DataObject([]));
-//    'product' => '1',
-//    'related_product' => '',
-//    'options' => array(
-//        1 => '1-text',
-//        2 => array('month' => 1, 'day' => 1, 'year' => 2001, 'hour' => 1, 'minute' => 1),
-//        3 => '1',
-//        4 => '1',
-//    ),
-//    'validate_datetime_2' => '',
-//    'qty' => '1',
 $wishlist->setSharingCode('fixture_unique_code')->save();
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index 362cbb2e887c7..be484f074342d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -156,9 +156,6 @@ protected function _getCollectionFactoryClassName()
     protected function _getPersistorClassName()
     {
         $target = $this->getSourceClassName();
-//        if (substr($target, -9) == 'Interface') {
-//            $target = substr($target, 1, strlen($target) -9);
-//        }
         return $target . 'Persistor';
     }