MC-18685: Remove custom layout updates from admin

Author: Oleksandr Gorkun

app/code/Magento/CatalogSampleData/Model/Product.php

@@ -103,6 +103,7 @@ public function install(array $productFixtures, array $galleryFixtures)
         $this->eavConfig->clear();
         $this->setGalleryFixtures($galleryFixtures);
 
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productFactory->create();
         foreach ($productFixtures as $fileName) {
             $fileName = $this->fixtureManager->getFixture($fileName);
@@ -138,6 +139,10 @@ public function install(array $productFixtures, array $galleryFixtures)
                 }
 
                 $this->prepareProduct($product, $data);
+                $product->setData('custom_layout_update', null);
+                if ($product->hasData(\Magento\Catalog\Model\Product::CUSTOM_ATTRIBUTES)) {
+                    $product->setCustomAttribute('custom_layout_update', null);
+                }
 
                 $product->save();
                 $this->installGallery($product);

app/code/Magento/CmsSampleData/Model/Page.php

@@ -60,11 +60,13 @@ public function install(array $fixtures)
                 }
                 $row = $data;
 
-                $this->pageFactory->create()
-                    ->load($row['identifier'], 'identifier')
-                    ->addData($row)
-                    ->setStores([\Magento\Store\Model\Store::DEFAULT_STORE_ID])
-                    ->save();
+                /** @var \Magento\Cms\Model\Page $page */
+                $page = $this->pageFactory->create();
+                $page->load($row['identifier'], 'identifier');
+                $page->addData($row);
+                $page->setCustomLayoutUpdateXml(null);
+                $page->setStores([\Magento\Store\Model\Store::DEFAULT_STORE_ID]);
+                $page->save();
             }
         }
     }