diff --git a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
index 764a0208f2129e25ea6b0c9b8e192ad6162c9df1..df411b6a21698033c60839c0d855c3b0ed4e96e5 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
@@ -102,7 +102,6 @@ class CreateHandler implements AttributeInterface
                 : null; // @todo verify is it normal to not have attributer_set_id
             /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
             foreach ($this->getAttributes($entityType, $attributeSetId) as $attribute) {
-                $ac[] = $attribute->getAttributeCode();
                 if ($attribute->isStatic()) {
                     continue;
                 }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
index 8181f6a136112d833a1b1c6895b74cee0e6e301b..c775a24a03c465dad45640a7f634823cb8b43ef8 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
@@ -67,6 +67,7 @@ class UpdateHandler implements AttributeInterface
      * @param AttributePersistor $attributePersistor
      * @param ReadSnapshot $readSnapshot
      * @param ScopeResolver $scopeResolver
+     * @param AttributeLoader $attributeLoader
      */
     public function __construct(
         AttributeRepository $attributeRepository,
@@ -86,15 +87,6 @@ class UpdateHandler implements AttributeInterface
         $this->attributeLoader = $attributeLoader ?: ObjectManager::getInstance()->get(AttributeLoader::class);
     }
 
-    /**
-     * @deprecated
-     * @return \Magento\Eav\Model\Entity\AttributeCache
-     */
-    private function getAttributeCache()
-    {
-        return ObjectManager::getInstance()->get(\Magento\Eav\Model\Entity\AttributeCache::class);
-    }
-
     /**
      * @param string $entityType
      * @param int $attributeSetId
@@ -104,6 +96,7 @@ class UpdateHandler implements AttributeInterface
     {
         return $this->attributeLoader->getAttributes($entityType, $attributeSetId);
     }
+
     /**
      * @param string $entityType
      * @param array $entityData