diff --git a/composer.json b/composer.json
index 4424cb729baf30a8a1b65ed83e644d65296a9e96..f2d3a0e7d11c49fc8dde09977f0e171ea30df681 100644
--- a/composer.json
+++ b/composer.json
@@ -206,8 +206,7 @@
             "Magento\\Tools\\": "dev/tools/Magento/Tools/",
             "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/",
             "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
-            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
-            "Magento\\ToolkitFramework\\": "dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/"
+            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/"
         }
     },
     "minimum-stability": "alpha",
diff --git a/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php b/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
index 1b0ccd0b23e9efb3d1f9afb13dfb8092f2d4e011..ac1d195141892667513ebac3ff1e39dd9db6d550 100644
--- a/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
@@ -78,7 +78,7 @@ class GenerateFixturesCommand extends Command
             /** @var $indexerRegistry \Magento\Indexer\Model\IndexerRegistry */
             $indexerRegistry = $fixtureModel->getObjectManager()->create('Magento\Indexer\Model\IndexerRegistry');
             $indexersState = [];
-            foreach ($indexerListIds as $key => $indexerId) {
+            foreach ($indexerListIds as $indexerId) {
                 $indexer = $indexerRegistry->get($indexerId['indexer_id']);
                 $indexersState[$indexerId['indexer_id']] = $indexer->isScheduled();
                 $indexer->setScheduled(true);
diff --git a/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php b/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
index 0845cb5e350d75e4ec828cb6f45eaa184c9c2230..606e49a0598052202366caad6d8dba57798dd3a5 100644
--- a/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
@@ -33,7 +33,6 @@ class CategoriesFixture extends Fixture
         /** @var $category \Magento\Catalog\Model\Category */
         $category = $this->fixtureModel->getObjectManager()->create('Magento\Catalog\Model\Category');
 
-        $groups = [];
         $storeGroups = $storeManager->getGroups();
         $i = 0;
         foreach ($storeGroups as $storeGroup) {