diff --git a/.htaccess b/.htaccess
index 074758ad18f..3fec686913b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -216,6 +216,7 @@
 ## Add default Expires header
 ## http://developer.yahoo.com/performance/rules.html#expires
     ExpiresActive On
+    ExpiresByType image/webp "access plus 1 year"
     ExpiresByType image/jpg "access plus 1 year"
     ExpiresByType image/jpeg "access plus 1 year"
     ExpiresByType image/gif "access plus 1 year"
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php
deleted file mode 100644
index 040407ec9ac..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Resource model for admin ACL
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Acl extends Mage_Admin_Model_Resource_Acl
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
deleted file mode 100644
index 6f57428fb50..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * ACL role resource
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Acl_Role extends Mage_Admin_Model_Resource_Acl_Role
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php
deleted file mode 100644
index 0b2117b2d32..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Roles collection
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Acl_Role_Collection extends Mage_Admin_Model_Resource_Acl_Role_Collection
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php
deleted file mode 100644
index 6cbbfd86a9e..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Permissions Collection
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Permissions_Collection extends Mage_Admin_Model_Resource_Permissions_Collection
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Role.php
deleted file mode 100644
index a4ccf10c04a..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Role.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mysql4 Role resource model
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Role extends Mage_Admin_Model_Resource_Role
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php
deleted file mode 100644
index baf6f365a7d..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Role Collection
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Role_Collection extends Mage_Admin_Model_Resource_Role_Collection
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php
deleted file mode 100644
index 180a3e66030..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mysql4 Roles resource model
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Roles extends Mage_Admin_Model_Resource_Roles
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php
deleted file mode 100644
index 67be0099122..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Roles Collection
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Roles_Collection extends Mage_Admin_Model_Resource_Roles_Collection
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php
deleted file mode 100644
index bfe718915ec..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Roles User Collection
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Roles_User_Collection extends Mage_Admin_Model_Resource_Roles_User_Collection
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php
deleted file mode 100644
index 4e55012e358..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mysql4 Rules Resource Model
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Rules extends Mage_Admin_Model_Resource_Rules
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php
deleted file mode 100644
index edd6ca99e84..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mysql4 Rules Collection
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_Rules_Collection extends Mage_Admin_Model_Resource_Rules_Collection
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php
deleted file mode 100644
index 9e514787d1a..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/User.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * ACL user resource
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_User extends Mage_Admin_Model_Resource_User
-{
-}
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php
deleted file mode 100644
index f6b052aeb12..00000000000
--- a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Admin
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Admin Mysql4 User Collection
- *
- * @category   Mage
- * @package    Mage_Admin
- * @deprecated
- */
-class Mage_Admin_Model_Mysql4_User_Collection extends Mage_Admin_Model_Resource_User_Collection
-{
-}
diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml
index 3ab950a5ff1..5209f35396e 100644
--- a/app/code/core/Mage/Admin/etc/config.xml
+++ b/app/code/core/Mage/Admin/etc/config.xml
@@ -28,7 +28,6 @@
             </admin>
             <admin_resource>
                 <class>Mage_Admin_Model_Resource</class>
-                <deprecatedNode>admin_mysql4</deprecatedNode>
                 <entities>
                     <user>
                         <table>admin_user</table>
diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php
deleted file mode 100644
index 58ba2007d09..00000000000
--- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_AdminNotification
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * AdminNotification Inbox model
- *
- * @category   Mage
- * @package    Mage_AdminNotification
- * @deprecated
- */
-class Mage_AdminNotification_Model_Mysql4_Inbox extends Mage_AdminNotification_Model_Resource_Inbox
-{
-}
diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php
deleted file mode 100644
index edd86021751..00000000000
--- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_AdminNotification
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * AdminNotification Inbox model
- *
- * @category   Mage
- * @package    Mage_AdminNotification
- * @deprecated
- */
-class Mage_AdminNotification_Model_Mysql4_Inbox_Collection extends Mage_AdminNotification_Model_Resource_Inbox_Collection
-{
-}
diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml
index abcdbfcc9fa..0e28d6120a2 100644
--- a/app/code/core/Mage/AdminNotification/etc/config.xml
+++ b/app/code/core/Mage/AdminNotification/etc/config.xml
@@ -28,7 +28,6 @@
             </adminnotification>
             <adminnotification_resource>
                 <class>Mage_AdminNotification_Model_Resource</class>
-                <deprecatedNode>adminnotification_mysql4</deprecatedNode>
                 <entities>
                     <inbox>
                         <table>adminnotification_inbox</table>
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
index 163c4c63a50..765d1b2957b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
@@ -85,7 +85,7 @@ public function getCategoryCollection()
         if (is_null($collection)) {
             $collection = Mage::getModel('catalog/category')->getCollection();
 
-            /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection $collection */
+            /** @var Mage_Catalog_Model_Resource_Category_Collection $collection */
             $collection->addAttributeToSelect('name')
                 ->addAttributeToSelect('is_active')
                 ->setProductStoreId($storeId)
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
index d966181f46b..35ff0705413 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
@@ -167,7 +167,7 @@ protected function _getNodeJson($node, $level = 0)
     /**
      * Adds some extra params to categories collection
      *
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection
+     * @return Mage_Catalog_Model_Resource_Category_Collection
      */
     public function getCategoryCollection()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
index 8356e6b3de6..a455e07e78b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
@@ -54,7 +54,7 @@ protected function _prepareLayout()
         $browseConfig = $this->getUploader()->getButtonConfig();
         $browseConfig
             ->setAttributes([
-                'accept' => $browseConfig->getMimeTypesByExtensions('gif, png, jpeg, jpg')
+                'accept' => $browseConfig->getMimeTypesByExtensions(Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS)
             ]);
 
         Mage::dispatchEvent('catalog_product_gallery_prepare_layout', ['block' => $this]);
diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
index da6e1768d1b..c946328b46a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
+++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
@@ -269,8 +269,7 @@ public function getMenuLevel($menu, $level = 0)
             if ((empty($item['url']) || ($item['url'] == '#')) && empty($item['children'])) {
                 continue; // for example hide System/Tools when empty
             }
-            $html .= '<li ' . (!empty($item['children']) ? 'onmouseover="Element.addClassName(this,\'over\')" '
-                . 'onmouseout="Element.removeClassName(this,\'over\')"' : '') . ' class="'
+            $html .= '<li class="'
                 . (!$level && !empty($item['active']) ? ' active' : '') . ' '
                 . (!empty($item['children']) ? ' parent' : '')
                 . (!empty($level) && !empty($item['last']) ? ' last' : '')
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
index 4fa6ccbbe66..ba4ea1ca2ab 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
@@ -79,7 +79,7 @@ public function getTreeArray($parentId = null, $asJson = false, $recursionLevel
     /**
      * Get categories collection
      *
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection
+     * @return Mage_Catalog_Model_Resource_Category_Collection
      */
     public function getCategoryCollection()
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
index 460d3859e75..7ccff7662a7 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
@@ -27,7 +27,7 @@ class Mage_Adminhtml_Model_System_Config_Backend_Image extends Mage_Adminhtml_Mo
      */
     protected function _getAllowedExtensions()
     {
-        return ['jpg', 'jpeg', 'gif', 'png'];
+        return Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS;
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php
index 5afd51fb5a6..a367fcd67b1 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php
@@ -30,7 +30,7 @@ public function getPrefixes()
         // use cached eav config
         $entityTypeId = Mage::getSingleton('eav/config')->getEntityType(Mage_Catalog_Model_Product::ENTITY)->getId();
 
-        /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection $collection */
+        /** @var Mage_Catalog_Model_Resource_Product_Attribute_Collection $collection */
         $collection = Mage::getResourceModel('catalog/product_attribute_collection');
         $collection->setEntityTypeFilter($entityTypeId);
         $collection->setFrontendInputTypeFilter('media_image');
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
index 524a430a3b7..c7562494c90 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
@@ -31,7 +31,7 @@ public function uploadAction()
     {
         try {
             $uploader = new Mage_Core_Model_File_Uploader('image');
-            $uploader->setAllowedExtensions(['jpg','jpeg','gif','png']);
+            $uploader->setAllowedExtensions(Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS);
             $uploader->addValidateCallback(
                 'catalog_product_image',
                 Mage::helper('catalog/image'),
diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
index fe50f6b01f8..bfa760c01ac 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -808,6 +808,9 @@ public function viewfileAction()
                 case 'jpg':
                     $contentType = 'image/jpeg';
                     break;
+                case 'webp':
+                    $contentType = 'image/webp';
+                    break;
                 case 'png':
                     $contentType = 'image/png';
                     break;
diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
index ecc908bb664..046e822bade 100644
--- a/app/code/core/Mage/Adminhtml/etc/config.xml
+++ b/app/code/core/Mage/Adminhtml/etc/config.xml
@@ -28,7 +28,6 @@
             </adminhtml>
             <adminhtml_resource>
                 <class>Mage_Adminhtml_Model_Resource</class>
-                <deprecatedNode>adminhtml_mysql4</deprecatedNode>
             </adminhtml_resource>
         </models>
         <blocks>
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php
deleted file mode 100644
index 2d85d3f94b1..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Resource model for admin ACL
- *
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Acl extends Mage_Api_Model_Resource_Acl
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php
deleted file mode 100644
index 301da443336..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * ACL role resource
- *
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Acl_Role extends Mage_Api_Model_Resource_Acl_Role
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php
deleted file mode 100644
index d59306a9b20..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Roles collection
- *
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Acl_Role_Collection extends Mage_Api_Model_Resource_Acl_Role_Collection
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php
deleted file mode 100644
index 11e1dc2b877..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Permissions_Collection extends Mage_Api_Model_Resource_Permissions_Collection
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Role.php
deleted file mode 100644
index eb8bb551709..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Role.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Role extends Mage_Api_Model_Resource_Role
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php
deleted file mode 100644
index a9e27b3f3e8..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Role_Collection extends Mage_Api_Model_Resource_Role_Collection
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles.php b/app/code/core/Mage/Api/Model/Mysql4/Roles.php
deleted file mode 100644
index 04eca70a856..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Roles.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Roles extends Mage_Api_Model_Resource_Roles
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php
deleted file mode 100644
index 77564b347dd..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Roles_Collection extends Mage_Api_Model_Resource_Roles_Collection
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php
deleted file mode 100644
index 9c69ee12dfd..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Roles_User_Collection extends Mage_Api_Model_Resource_Roles_User_Collection
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules.php b/app/code/core/Mage/Api/Model/Mysql4/Rules.php
deleted file mode 100644
index 9ef5682c1f0..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Rules.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Rules extends Mage_Api_Model_Resource_Rules
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php
deleted file mode 100644
index 3a98d6da64c..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_Rules_Collection extends Mage_Api_Model_Resource_Rules_Collection
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php
deleted file mode 100644
index c8131f7de5e..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/User.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * ACL user resource
- *
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_User extends Mage_Api_Model_Resource_User
-{
-}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php
deleted file mode 100644
index 6b9a405f2b9..00000000000
--- a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Api
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Api
- * @deprecated
- */
-class Mage_Api_Model_Mysql4_User_Collection extends Mage_Api_Model_Resource_User_Collection
-{
-}
diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml
index 783088142d6..a114635750c 100644
--- a/app/code/core/Mage/Api/etc/config.xml
+++ b/app/code/core/Mage/Api/etc/config.xml
@@ -42,7 +42,6 @@
             </api>
             <api_resource>
                 <class>Mage_Api_Model_Resource</class>
-                <deprecatedNode>api_mysql4</deprecatedNode>
                 <entities>
                     <assert>
                         <table>api_assert</table>
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php
deleted file mode 100644
index 130fb28785f..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle Resource Model
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Bundle extends Mage_Bundle_Model_Resource_Bundle
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php
deleted file mode 100644
index fb68de30a12..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle products Price indexer resource model
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Indexer_Price extends Mage_Bundle_Model_Resource_Indexer_Price
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php
deleted file mode 100644
index ae3d8e21ef3..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle Stock Status Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Indexer_Stock extends Mage_Bundle_Model_Resource_Indexer_Stock
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php
deleted file mode 100644
index 39998c1290e..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle Option Resource Model
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Option extends Mage_Bundle_Model_Resource_Option
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php
deleted file mode 100644
index 18c1bf06683..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle Options Resource Collection
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Option_Collection extends Mage_Bundle_Model_Resource_Option_Collection
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php
deleted file mode 100644
index 24d505a34cd..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle Product Price Index Resource model
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Price_Index extends Mage_Bundle_Model_Resource_Price_Index
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php
deleted file mode 100644
index 19d196ef2f0..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle Selection Resource Model
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Selection extends Mage_Bundle_Model_Resource_Selection
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php
deleted file mode 100644
index c6008bd2ae8..00000000000
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bundle Selections Resource Collection
- *
- * @category   Mage
- * @package    Mage_Bundle
- * @deprecated
- */
-class Mage_Bundle_Model_Mysql4_Selection_Collection extends Mage_Bundle_Model_Resource_Selection_Collection
-{
-}
diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php
index a3b315ecf08..32f7427966e 100644
--- a/app/code/core/Mage/Bundle/Model/Observer.php
+++ b/app/code/core/Mage/Bundle/Model/Observer.php
@@ -77,7 +77,7 @@ public function appendUpsellProducts($observer)
             return $this;
         }
 
-        /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection $collection */
+        /** @var Mage_Catalog_Model_Resource_Product_Link_Product_Collection $collection */
         $collection = $observer->getEvent()->getCollection();
         $limit      = $observer->getEvent()->getLimit();
         if (is_array($limit)) {
diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml
index 9bd44d8c713..ff6c690f282 100644
--- a/app/code/core/Mage/Bundle/etc/config.xml
+++ b/app/code/core/Mage/Bundle/etc/config.xml
@@ -28,7 +28,6 @@
             </bundle>
             <bundle_resource>
                 <class>Mage_Bundle_Model_Resource</class>
-                <deprecatedNode>bundle_mysql4</deprecatedNode>
                 <entities>
                     <option>
                         <table>catalog_product_bundle_option</table>
diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
index ef1dabca0ac..01a6f5a9a8a 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
@@ -24,7 +24,7 @@ class Mage_Catalog_Block_Product_Compare_Sidebar extends Mage_Catalog_Block_Prod
     /**
      * Compare Products Collection
      *
-     * @var null|Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection
+     * @var null|Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
      */
     protected $_itemsCollection = null;
 
@@ -40,7 +40,7 @@ protected function _construct()
     /**
      * Retrieve Compare Products Collection
      *
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection
+     * @return Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
      */
     public function getItems()
     {
@@ -53,7 +53,7 @@ public function getItems()
     /**
      * Set Compare Products Collection
      *
-     * @param Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection $collection
+     * @param Mage_Catalog_Model_Resource_Product_Compare_Item_Collection $collection
      * @return $this
      */
     public function setItems($collection)
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php
index 267a857284b..e2c49a064af 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php
@@ -31,7 +31,7 @@ class Mage_Catalog_Block_Product_List_Crosssell extends Mage_Catalog_Block_Produ
     /**
      * Crosssell item collection
      *
-     * @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection
+     * @var Mage_Catalog_Model_Resource_Product_Link_Product_Collection
      */
     protected $_itemCollection;
 
@@ -76,7 +76,7 @@ protected function _beforeToHtml()
     /**
      * Retrieve crosssell items collection
      *
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection
+     * @return Mage_Catalog_Model_Resource_Product_Link_Product_Collection
      */
     public function getItems()
     {
diff --git a/app/code/core/Mage/Catalog/Block/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Widget/Link.php
index 9b69006c218..b3bc7e8ea4a 100644
--- a/app/code/core/Mage/Catalog/Block/Widget/Link.php
+++ b/app/code/core/Mage/Catalog/Block/Widget/Link.php
@@ -26,7 +26,7 @@ class Mage_Catalog_Block_Widget_Link extends Mage_Core_Block_Html_Link implement
 {
     /**
      * Entity model name which must be used to retrieve entity specific data.
-     * @var null|Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract
+     * @var null|Mage_Catalog_Model_Resource_Abstract
      */
     protected $_entityResource = null;
 
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php
index b32ec9c31ec..7951689b0a0 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php
@@ -26,7 +26,7 @@ class Mage_Catalog_Helper_Product_Compare extends Mage_Core_Helper_Url
     /**
      * Product Compare Items Collection
      *
-     * @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection
+     * @var Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
      */
     protected $_itemCollection;
 
@@ -200,7 +200,7 @@ public function getClearListUrl()
     /**
      * Retrieve compare list items collection
      *
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection
+     * @return Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
      */
     public function getItemCollection()
     {
diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php
index 5423cca892d..3af1c678ac1 100644
--- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php
+++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php
@@ -32,6 +32,7 @@ abstract class Mage_Catalog_Model_Api2_Product_Image_Rest extends Mage_Catalog_M
      * @var array
      */
     protected $_mimeTypes = [
+        'image/webp' => 'webp',
         'image/jpg'  => 'jpg',
         'image/jpeg' => 'jpg',
         'image/gif'  => 'gif',
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php
index a56c4885759..505f62a41d1 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Api.php
@@ -122,7 +122,7 @@ public function tree($parentId = null, $store = null)
             $parentId = 1;
         }
 
-        /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree $tree */
+        /** @var Mage_Catalog_Model_Resource_Category_Tree $tree */
         $tree = Mage::getResourceSingleton('catalog/category_tree')
             ->load();
 
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
index 577c0598f46..4c0e34c3709 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -22,41 +22,51 @@
 class Mage_Catalog_Model_Category_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
 {
     /**
-     * Save uploaded file and set its name to category
+     * @return array
+     */
+    public function getAllowedExtensions(): array
+    {
+        return Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS;
+    }
+
+    /**
+     * Save uploaded file and set its name to category attribute
      * @param Varien_Object $object
      * @return $this
      */
     public function afterSave($object)
     {
-        $value = $object->getData($this->getAttribute()->getName());
-        if (empty($value) && empty($_FILES)) {
-            return $this;
-        }
+        $name  = $this->getAttribute()->getName();
+        $value = $object->getData($name);
 
         if (is_array($value) && !empty($value['delete'])) {
-            $object->setData($this->getAttribute()->getName(), '');
-            $this->getAttribute()->getEntity()
-                ->saveAttribute($object, $this->getAttribute()->getName());
+            $object->setData($name, '');
+            $this->getAttribute()->getEntity()->saveAttribute($object, $name);
             return $this;
         }
 
-        $path = Mage::getBaseDir('media') . DS . 'catalog' . DS . 'category' . DS;
+        if (!empty($_FILES[$name])) {
+            try {
+                $validator = Mage::getModel('core/file_validator_image');
+                $uploader  = Mage::getModel('core/file_uploader', $name);
+                $uploader->setAllowedExtensions($this->getAllowedExtensions());
+                $uploader->setAllowRenameFiles(true);
+                $uploader->setFilesDispersion(false);
+                $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
+                $uploader->save(Mage::getBaseDir('media') . DS . 'catalog' . DS . 'category');
 
-        try {
-            $validator = Mage::getModel('core/file_validator_image');
-            $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName());
-            $uploader->setAllowedExtensions(['jpg','jpeg','gif','png']);
-            $uploader->setAllowRenameFiles(true);
-            $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
-            $result = $uploader->save($path);
-
-            $object->setData($this->getAttribute()->getName(), $result['file']);
-            $this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
-        } catch (Exception $e) {
-            if ($e->getCode() != UPLOAD_ERR_NO_FILE) {
-                Mage::logException($e);
+                $fileName = $uploader->getUploadedFileName();
+                if ($fileName) {
+                    $object->setData($name, $fileName);
+                    $this->getAttribute()->getEntity()->saveAttribute($object, $name);
+                }
+            } catch (Exception $e) {
+                if ($e->getCode() != UPLOAD_ERR_NO_FILE) {
+                    Mage::logException($e);
+                }
             }
         }
+
         return $this;
     }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
index 2dc7513fd03..4458fd2c237 100644
--- a/app/code/core/Mage/Catalog/Model/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Product.php
@@ -270,7 +270,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
     /**
      * Product type instance
      *
-     * @var Mage_Catalog_Model_Product_Type_Abstract
+     * @var Mage_Catalog_Model_Product_Type_Abstract|null|false
      */
     protected $_typeInstance            = null;
 
@@ -282,7 +282,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
     /**
      * Product link instance
      *
-     * @var Mage_Catalog_Model_Product_Link
+     * @var Mage_Catalog_Model_Product_Link|null
      */
     protected $_linkInstance;
 
@@ -296,7 +296,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
     /**
      * Product Url Instance
      *
-     * @var Mage_Catalog_Model_Product_Url
+     * @var Mage_Catalog_Model_Product_Url|null
      */
     protected $_urlModel = null;
 
@@ -329,7 +329,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
     protected $_calculatePrice = true;
 
     /**
-     * @var Mage_CatalogInventory_Model_Stock_Item
+     * @var Mage_CatalogInventory_Model_Stock_Item|null
      */
     protected $_stockItem;
 
@@ -698,7 +698,7 @@ public function hasStockItem()
     }
 
     /**
-     * @param Varien_Object|Mage_CatalogInventory_Model_Stock_Item $stockItem
+     * @param Mage_CatalogInventory_Model_Stock_Item $stockItem
      * @return $this
      */
     public function setStockItem($stockItem)
@@ -2255,14 +2255,23 @@ protected function _clearData()
 
         $this->setData([]);
         $this->setOrigData();
-        $this->_customOptions       = [];
-        $this->_optionInstance      = null;
-        $this->_options             = [];
-        $this->_canAffectOptions    = false;
-        $this->_errors              = [];
-        $this->_defaultValues       = [];
-        $this->_storeValuesFlags    = [];
-        $this->_lockedAttributes    = [];
+        $this->_customOptions         = [];
+        $this->_optionInstance        = null;
+        $this->_options               = [];
+        $this->_canAffectOptions      = false;
+        $this->_errors                = [];
+        $this->_defaultValues         = [];
+        $this->_storeValuesFlags      = [];
+        $this->_lockedAttributes      = [];
+        $this->_typeInstance          = null;
+        $this->_typeInstanceSingleton = null;
+        $this->_linkInstance          = null;
+        $this->_reservedAttributes    = null;
+        $this->_isDuplicable          = true;
+        $this->_calculatePrice        = true;
+        $this->_stockItem             = null;
+        $this->_isDeleteable          = true;
+        $this->_isReadonly            = false;
 
         return $this;
     }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
index 8ee2ab0b3ab..600be73a4b9 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -288,8 +288,7 @@ public function addImage(
         Mage::dispatchEvent('catalog_product_media_add_image', ['product' => $product, 'image' => $file]);
 
         $pathinfo = pathinfo($file);
-        $imgExtensions = ['jpg','jpeg','gif','png'];
-        if (!isset($pathinfo['extension']) || !in_array(strtolower($pathinfo['extension']), $imgExtensions)) {
+        if (!isset($pathinfo['extension']) || !in_array(strtolower($pathinfo['extension']), Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS)) {
             Mage::throwException(Mage::helper('catalog')->__('Invalid image file type.'));
         }
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
index 3eaab04b6ef..42a081df297 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
@@ -33,6 +33,7 @@ class Mage_Catalog_Model_Product_Attribute_Media_Api extends Mage_Catalog_Model_
      * @var array
      */
     protected $_mimeTypes = [
+        'image/webp' => 'webp',
         'image/jpeg' => 'jpg',
         'image/gif'  => 'gif',
         'image/png'  => 'png'
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php
index de093a32997..d693f3e927c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option.php
@@ -467,7 +467,7 @@ public function getProductOptionCollection(Mage_Catalog_Model_Product $product)
     /**
      * Get collection of values for current option
      *
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection
+     * @return Mage_Catalog_Model_Resource_Product_Option_Value_Collection
      */
     public function getValuesCollection()
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
deleted file mode 100644
index 58bb00ee667..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog entity abstract model
- *
- * @category   Mage
- * @package    Mage_Catalog
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract extends Mage_Catalog_Model_Resource_Abstract
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php
deleted file mode 100644
index bf1d7d7dc31..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog attribute resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute extends Mage_Catalog_Model_Resource_Attribute
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
deleted file mode 100644
index c7876c718e2..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog category model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category extends Mage_Catalog_Model_Resource_Category
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php
deleted file mode 100644
index e6c1448b05e..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog category EAV additional attribute resource collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection extends Mage_Catalog_Model_Resource_Category_Attribute_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
deleted file mode 100644
index e8ef4509453..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Category image attribute frontend
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image extends Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
deleted file mode 100644
index 43dd7140a08..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog category landing page attribute source
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout extends Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
deleted file mode 100644
index 4055c1778f8..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog category landing page attribute source
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode extends Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
deleted file mode 100644
index 4eef74a8f2d..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog category landing page attribute source
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page extends Mage_Catalog_Model_Resource_Category_Attribute_Source_Page
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
deleted file mode 100644
index 8bdb7c25020..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Category resource collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection extends Mage_Catalog_Model_Resource_Category_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php
deleted file mode 100644
index d59b02c996a..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Category flat model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat extends Mage_Catalog_Model_Resource_Category_Flat
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php
deleted file mode 100644
index 533a7d48895..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog category flat collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection extends Mage_Catalog_Model_Resource_Category_Flat_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php
deleted file mode 100644
index 9160d770b7c..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product extends Mage_Catalog_Model_Resource_Category_Indexer_Product
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
deleted file mode 100644
index d104e05e7a3..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Category tree model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree extends Mage_Catalog_Model_Resource_Category_Tree
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
deleted file mode 100644
index e562b21b05a..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog EAV collection resource abstract model
- * Implement using different stores for retrieve attribute values
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract extends Mage_Catalog_Model_Resource_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php
deleted file mode 100644
index 3ba6280bfe1..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Config Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Config extends Mage_Catalog_Model_Resource_Config
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php
deleted file mode 100644
index d5d6fe4aa9e..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Layer Attribute Filter Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute extends Mage_Catalog_Model_Resource_Layer_Filter_Attribute
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php
deleted file mode 100644
index 83df5aa7cf7..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Layer Decimal attribute Filter Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal extends Mage_Catalog_Model_Resource_Layer_Filter_Decimal
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php
deleted file mode 100644
index df75b554394..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Layer Price Filter resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price extends Mage_Catalog_Model_Resource_Layer_Filter_Price
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
deleted file mode 100644
index 390fccc1dc1..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product entity resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product extends Mage_Catalog_Model_Resource_Product
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php
deleted file mode 100644
index 006fad89d8e..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Mass processing resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action extends Mage_Catalog_Model_Resource_Product_Action
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
deleted file mode 100644
index eb327ca324a..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product image attribute backend
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
deleted file mode 100644
index 6b5c647e70c..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product media gallery attribute backend resource
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
deleted file mode 100644
index 7ab6ce00b96..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product tier price backend attribute model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
deleted file mode 100644
index b84d06ac7d4..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product url key attribute backend
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php
deleted file mode 100644
index 878112be169..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product EAV additional attribute resource collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection extends Mage_Catalog_Model_Resource_Product_Attribute_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
deleted file mode 100644
index 30578c52a79..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product image attribute frontend
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image extends Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
deleted file mode 100644
index ac80bebec17..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product attribute tier price frontend model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
deleted file mode 100644
index 8db413eea4f..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection extends Mage_Catalog_Model_Resource_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
deleted file mode 100644
index 8deb811f911..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog compare item resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item extends Mage_Catalog_Model_Resource_Product_Compare_Item
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
deleted file mode 100644
index 49fb5d58a62..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Compare Items Resource Collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection extends Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php
deleted file mode 100644
index ec6142da386..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Flat resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat extends Mage_Catalog_Model_Resource_Product_Flat
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php
deleted file mode 100644
index a17e8ed6c82..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Flat Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer extends Mage_Catalog_Model_Resource_Product_Flat_Indexer
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php
deleted file mode 100644
index c74b056c5ec..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Indexer Abstract Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- */
-abstract class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php
deleted file mode 100644
index 6329a6d59d6..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Eav Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav extends Mage_Catalog_Model_Resource_Product_Indexer_Eav
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php
deleted file mode 100644
index 85c23a4dfef..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Eav Attributes abstract indexer resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- */
-abstract class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php
deleted file mode 100644
index 725781a9f85..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Eav Decimal Attributes Indexer resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php
deleted file mode 100644
index 4bcd081991b..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php
deleted file mode 100644
index 681cfafccab..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Price Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price extends Mage_Catalog_Model_Resource_Product_Indexer_Price
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php
deleted file mode 100644
index 6fc2f8f6513..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Configurable Products Price Indexer Resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php
deleted file mode 100644
index 0321b0bfe98..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Default Product Type Price Indexer Resource model
- * For correctly work need define product type id
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Default
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php
deleted file mode 100644
index 31da483f47c..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Configurable Products Price Indexer Resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php
deleted file mode 100644
index 1cfa47604f8..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Type Price Indexer interface
- *
- * @category   Mage
- * @package    Mage_Catalog
- */
-interface Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Interface extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
deleted file mode 100644
index 0aea60a4ddc..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product link resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link extends Mage_Catalog_Model_Resource_Product_Link
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
deleted file mode 100644
index fa1b6e8f508..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product links collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection extends Mage_Catalog_Model_Resource_Product_Link_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
deleted file mode 100644
index 548d7c72eb5..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product linked products collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection extends Mage_Catalog_Model_Resource_Product_Link_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
deleted file mode 100644
index 06815e3dff3..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product custom option resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option extends Mage_Catalog_Model_Resource_Product_Option
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
deleted file mode 100644
index b1e370c6843..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product options collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection extends Mage_Catalog_Model_Resource_Product_Option_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
deleted file mode 100644
index a54b37c2530..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product custom option resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value extends Mage_Catalog_Model_Resource_Product_Option_Value
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
deleted file mode 100644
index e133cfaef2c..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product option values collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection extends Mage_Catalog_Model_Resource_Product_Option_Value_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php
deleted file mode 100644
index f37bcd6943e..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Relations Resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation extends Mage_Catalog_Model_Resource_Product_Relation
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
deleted file mode 100644
index 8e88022f616..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product website resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status extends Mage_Catalog_Model_Resource_Product_Status
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
deleted file mode 100644
index d0e34a184d3..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Configurable product type resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable extends Mage_Catalog_Model_Resource_Product_Type_Configurable
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
deleted file mode 100644
index 4c515767955..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog super product attribute resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute extends Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
deleted file mode 100644
index 61f15958974..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Configurable Product Attribute Collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection extends Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
deleted file mode 100644
index c9068e248ee..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog super product link collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection extends Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
deleted file mode 100644
index 10c9da37deb..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Product Website Resource Model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website extends Mage_Catalog_Model_Resource_Product_Website
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
deleted file mode 100644
index 723c5bd4c70..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Eav Sendfriend resource model class
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend extends Mage_Sendfriend_Model_Resource_Sendfriend
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
deleted file mode 100644
index d67af314a9e..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Eav Sendfriend Resource Collection
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection extends Mage_Sendfriend_Model_Resource_Sendfriend_Collection
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
deleted file mode 100644
index f2ca19f357a..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog entity setup
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Setup extends Mage_Catalog_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
deleted file mode 100644
index 34d1bdfa86f..00000000000
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog url rewrite resource model
- *
- * @category   Mage
- * @package    Mage_Catalog
- * @deprecated
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Url extends Mage_Catalog_Model_Resource_Url
-{
-}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php
index 3a3005e4fc3..71499311394 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php
@@ -22,37 +22,49 @@
 class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
 {
     /**
+     * @return array
+     */
+    public function getAllowedExtensions(): array
+    {
+        return Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS;
+    }
+
+    /**
+     * Save uploaded file and set its name to product attribute
      * @param Varien_Object $object
      * @return $this
      */
     public function afterSave($object)
     {
-        $value = $object->getData($this->getAttribute()->getName());
+        $name  = $this->getAttribute()->getName();
+        $value = $object->getData($name);
 
         if (is_array($value) && !empty($value['delete'])) {
-            $object->setData($this->getAttribute()->getName(), '');
-            $this->getAttribute()->getEntity()
-                ->saveAttribute($object, $this->getAttribute()->getName());
+            $object->setData($name, '');
+            $this->getAttribute()->getEntity()->saveAttribute($object, $name);
             return $this;
         }
 
-        try {
-            $validator = Mage::getModel('core/file_validator_image');
-            $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName());
-            $uploader->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png']);
-            $uploader->setAllowRenameFiles(true);
-            $uploader->setFilesDispersion(true);
-            $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
-            $uploader->save(Mage::getBaseDir('media') . '/catalog/product');
+        if (!empty($_FILES[$name])) {
+            try {
+                $validator = Mage::getModel('core/file_validator_image');
+                $uploader  = Mage::getModel('core/file_uploader', $name);
+                $uploader->setAllowedExtensions($this->getAllowedExtensions());
+                $uploader->setAllowRenameFiles(true);
+                $uploader->setFilesDispersion(true);
+                $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
+                $uploader->save(Mage::getBaseDir('media') . DS . 'catalog' . DS . 'product');
 
-            $fileName = $uploader->getUploadedFileName();
-            if ($fileName) {
-                $object->setData($this->getAttribute()->getName(), $fileName);
-                $this->getAttribute()->getEntity()
-                    ->saveAttribute($object, $this->getAttribute()->getName());
+                $fileName = $uploader->getUploadedFileName();
+                if ($fileName) {
+                    $object->setData($name, $fileName);
+                    $this->getAttribute()->getEntity()->saveAttribute($object, $name);
+                }
+            } catch (Exception $e) {
+                if ($e->getCode() != UPLOAD_ERR_NO_FILE) {
+                    Mage::logException($e);
+                }
             }
-        } catch (Exception $e) {
-            return $this;
         }
 
         return $this;
diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml
index 61cfb611821..a5039bb4869 100644
--- a/app/code/core/Mage/Catalog/etc/config.xml
+++ b/app/code/core/Mage/Catalog/etc/config.xml
@@ -216,7 +216,6 @@
             </catalog>
             <catalog_resource>
                 <class>Mage_Catalog_Model_Resource</class>
-                <deprecatedNode>catalog_resource_eav_mysql4</deprecatedNode>
                 <entities>
                     <product>
                         <table>catalog_product_entity</table>
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
deleted file mode 100644
index 35adc915505..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Index resource model abstraction
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Abstract extends Mage_CatalogIndex_Model_Resource_Abstract
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php
deleted file mode 100644
index 12a3e26c231..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Aggregation extends Mage_CatalogIndex_Model_Resource_Aggregation
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
deleted file mode 100644
index fcf90df7156..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Attribute index resource model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Attribute extends Mage_CatalogIndex_Model_Resource_Attribute
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
deleted file mode 100644
index 8a0f8c640ec..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Data_Abstract extends Mage_CatalogIndex_Model_Resource_Data_Abstract
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
deleted file mode 100644
index 4cf52cdaf2b..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Data_Configurable extends Mage_CatalogIndex_Model_Resource_Data_Configurable
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
deleted file mode 100644
index 208f68d034f..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogIndex Grouped Products Data Retriever Resource Model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Data_Grouped extends Mage_CatalogIndex_Model_Resource_Data_Grouped
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
deleted file mode 100644
index 3fa67372a10..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reindexer resource model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Indexer extends Mage_CatalogIndex_Model_Resource_Indexer
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
deleted file mode 100644
index 97b629df9ed..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Indexer resource model abstraction
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Indexer_Abstract extends Mage_CatalogIndex_Model_Resource_Indexer_Abstract
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
deleted file mode 100644
index 71a17bdf17a..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav indexer resource model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Indexer_Eav extends Mage_CatalogIndex_Model_Resource_Indexer_Eav
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
deleted file mode 100644
index 14b76cb309d..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Price indexer resource model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
deleted file mode 100644
index a3c542fe3a0..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Price indexer resource model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Indexer_Price extends Mage_CatalogIndex_Model_Resource_Indexer_Price
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
deleted file mode 100644
index 8f83a277eaa..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Price index resource model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Price extends Mage_CatalogIndex_Model_Resource_Price
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
deleted file mode 100644
index 3fa2c527e39..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Index type retriever resource model
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Retreiver extends Mage_CatalogIndex_Model_Resource_Retreiver
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php
deleted file mode 100644
index 58f8d652fd3..00000000000
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogIndex
- * @deprecated
- */
-class Mage_CatalogIndex_Model_Mysql4_Setup extends Mage_CatalogIndex_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml
index 04e090b2ee8..0c942c443f1 100644
--- a/app/code/core/Mage/CatalogIndex/etc/config.xml
+++ b/app/code/core/Mage/CatalogIndex/etc/config.xml
@@ -44,7 +44,6 @@
             </catalogindex>
             <catalogindex_resource>
                 <class>Mage_CatalogIndex_Model_Resource</class>
-                <deprecatedNode>catalogindex_mysql4</deprecatedNode>
                 <entities>
                     <eav>
                         <table>catalog_product_index_eav</table>
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php
deleted file mode 100644
index 653ccf7495b..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogInventory Stock Status Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Indexer_Stock extends Mage_CatalogInventory_Model_Resource_Indexer_Stock
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php
deleted file mode 100644
index 74ba7e6e3ce..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogInventory Configurable Products Stock Status Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Configurable extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php
deleted file mode 100644
index d95ff719b90..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogInventory Default Stock Status Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Default extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php
deleted file mode 100644
index f4982e789e5..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogInventory Grouped Products Stock Status Indexer Resource Model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Grouped extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php
deleted file mode 100644
index 56b8a8fd4e9..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogInventory Stock Indexer Interface
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- */
-interface Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Interface extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Interface
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
deleted file mode 100644
index e01433c56a8..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Stock resource model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Stock extends Mage_CatalogInventory_Model_Resource_Stock
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
deleted file mode 100644
index 40d33105e3c..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Stock item resource model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Stock_Item extends Mage_CatalogInventory_Model_Resource_Stock_Item
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
deleted file mode 100644
index a32009562a3..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Stock item collection resource model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection extends Mage_CatalogInventory_Model_Resource_Stock_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php
deleted file mode 100644
index 5f6c8e61667..00000000000
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogInventory Stock Status per website Resource Model
- *
- * @category   Mage
- * @package    Mage_CatalogInventory
- * @deprecated
- */
-class Mage_CatalogInventory_Model_Mysql4_Stock_Status extends Mage_CatalogInventory_Model_Resource_Stock_Status
-{
-}
diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml
index 8ccc13e6f53..b434d644ec8 100644
--- a/app/code/core/Mage/CatalogInventory/etc/config.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/config.xml
@@ -28,7 +28,6 @@
             </cataloginventory>
             <cataloginventory_resource>
                 <class>Mage_CatalogInventory_Model_Resource</class>
-                <deprecatedNode>cataloginventory_mysql4</deprecatedNode>
                 <entities>
                     <stock>
                         <table>cataloginventory_stock</table>
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
deleted file mode 100644
index 1fd6b6af25c..00000000000
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog rules resource model
- *
- * @category   Mage
- * @package    Mage_CatalogRule
- * @deprecated
- */
-class Mage_CatalogRule_Model_Mysql4_Rule extends Mage_CatalogRule_Model_Resource_Rule
-{
-}
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
deleted file mode 100644
index 4c5f09da3cb..00000000000
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogRule
- * @deprecated
- */
-class Mage_CatalogRule_Model_Mysql4_Rule_Collection extends Mage_CatalogRule_Model_Resource_Rule_Collection
-{
-}
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
deleted file mode 100644
index d5ca75ce34a..00000000000
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog Rule Product Aggregated Price per date Resource Model
- *
- * @category   Mage
- * @package    Mage_CatalogRule
- * @deprecated
- */
-class Mage_CatalogRule_Model_Mysql4_Rule_Product_Price extends Mage_CatalogRule_Model_Resource_Rule_Product_Price
-{
-}
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
deleted file mode 100644
index ecc5420a4c9..00000000000
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogRule
- * @deprecated
- */
-class Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection extends Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection
-{
-}
diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml
index d41de321cd7..25fe10a167c 100644
--- a/app/code/core/Mage/CatalogRule/etc/config.xml
+++ b/app/code/core/Mage/CatalogRule/etc/config.xml
@@ -33,7 +33,6 @@
             </catalogrule>
             <catalogrule_resource>
                 <class>Mage_CatalogRule_Model_Resource</class>
-                <deprecatedNode>catalogrule_mysql4</deprecatedNode>
                 <entities>
                     <rule>
                         <table>catalogrule</table>
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php
deleted file mode 100644
index 2debf271861..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Advanced Catalog Search resource model
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Advanced extends Mage_CatalogSearch_Model_Resource_Advanced
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
deleted file mode 100644
index 634e0fa94d8..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Advanced_Collection extends Mage_CatalogSearch_Model_Resource_Advanced_Collection
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
deleted file mode 100644
index 63c7515f1b6..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogSearch Fulltext Index resource model
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Fulltext extends Mage_CatalogSearch_Model_Resource_Fulltext
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php
deleted file mode 100644
index 5219dbbe5c1..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Fulltext_Collection extends Mage_CatalogSearch_Model_Resource_Fulltext_Collection
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php
deleted file mode 100644
index 4737c4b0901..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogSearch Fulltext Index Engine resource model
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Fulltext_Engine extends Mage_CatalogSearch_Model_Resource_Fulltext_Engine
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php
deleted file mode 100644
index a6c93bdaf7b..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CatalogSearch fulltext indexer resource model
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Indexer_Fulltext extends Mage_CatalogSearch_Model_Resource_Indexer_Fulltext
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
deleted file mode 100644
index e7133591549..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog search query resource model
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Query extends Mage_CatalogSearch_Model_Resource_Query
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
deleted file mode 100644
index e4d94d02371..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog search query collection
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Query_Collection extends Mage_CatalogSearch_Model_Resource_Query_Collection
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
deleted file mode 100644
index 1491849b916..00000000000
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_CatalogSearch
- * @deprecated
- */
-class Mage_CatalogSearch_Model_Mysql4_Search_Collection extends Mage_CatalogSearch_Model_Resource_Search_Collection
-{
-}
diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml
index 43b9e74fc0b..75125efd4a3 100644
--- a/app/code/core/Mage/CatalogSearch/etc/config.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/config.xml
@@ -31,7 +31,6 @@
             </catalogsearch>
             <catalogsearch_resource>
                 <class>Mage_CatalogSearch_Model_Resource</class>
-                <deprecatedNode>catalogsearch_mysql4</deprecatedNode>
                 <entities>
                     <search_query>
                         <table>catalogsearch_query</table>
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
deleted file mode 100644
index b9b79b673ec..00000000000
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Checkout
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Checkout
- * @deprecated
- */
-class Mage_Checkout_Model_Mysql4_Agreement extends Mage_Checkout_Model_Resource_Agreement
-{
-}
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
deleted file mode 100644
index a6b2cc01ca9..00000000000
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Checkout
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Checkout
- * @deprecated
- */
-class Mage_Checkout_Model_Mysql4_Agreement_Collection extends Mage_Checkout_Model_Resource_Agreement_Collection
-{
-}
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
deleted file mode 100644
index 03218c4cb84..00000000000
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Checkout
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Checkout
- * @deprecated
- */
-class Mage_Checkout_Model_Mysql4_Cart extends Mage_Checkout_Model_Resource_Cart
-{
-}
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php
deleted file mode 100644
index d70895f9c1b..00000000000
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Checkout
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Checkout Resource Setup Model
- *
- * @category   Mage
- * @package    Mage_Checkout
- * @deprecated
- */
-class Mage_Checkout_Model_Mysql4_Setup extends Mage_Checkout_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Checkout/etc/config.xml b/app/code/core/Mage/Checkout/etc/config.xml
index e0e40723b05..9cf43d75ff7 100644
--- a/app/code/core/Mage/Checkout/etc/config.xml
+++ b/app/code/core/Mage/Checkout/etc/config.xml
@@ -119,7 +119,6 @@
             </checkout>
             <checkout_resource>
                 <class>Mage_Checkout_Model_Resource</class>
-                <deprecatedNode>checkout_mysql4</deprecatedNode>
                 <entities>
                     <agreement>
                         <table>checkout_agreement</table>
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php
deleted file mode 100644
index 06751d58b9e..00000000000
--- a/app/code/core/Mage/Cms/Model/Mysql4/Block.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Cms
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CMS block model
- *
- * @category   Mage
- * @package    Mage_Cms
- * @deprecated
- */
-class Mage_Cms_Model_Mysql4_Block extends Mage_Cms_Model_Resource_Block
-{
-}
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
deleted file mode 100644
index 8a45246bc8d..00000000000
--- a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Cms
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CMS block model
- *
- * @category   Mage
- * @package    Mage_Cms
- * @deprecated
- */
-class Mage_Cms_Model_Mysql4_Block_Collection extends Mage_Cms_Model_Resource_Block_Collection
-{
-}
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page.php b/app/code/core/Mage/Cms/Model/Mysql4/Page.php
deleted file mode 100644
index 4c10942226d..00000000000
--- a/app/code/core/Mage/Cms/Model/Mysql4/Page.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Cms
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Cms page mysql resource
- *
- * @category   Mage
- * @package    Mage_Cms
- * @deprecated
- */
-class Mage_Cms_Model_Mysql4_Page extends Mage_Cms_Model_Resource_Page
-{
-}
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
deleted file mode 100644
index 502ea6e6b19..00000000000
--- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Cms
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * CMS page collection
- *
- * @category   Mage
- * @package    Mage_Cms
- * @deprecated
- */
-class Mage_Cms_Model_Mysql4_Page_Collection extends Mage_Cms_Model_Resource_Page_Collection
-{
-}
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php
deleted file mode 100644
index 61d0d3a9801..00000000000
--- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Cms
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Cms page service resource model
- *
- * @category   Mage
- * @package    Mage_Cms
- * @deprecated
- */
-class Mage_Cms_Model_Mysql4_Page_Service extends Mage_Cms_Model_Resource_Page_Service
-{
-}
diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml
index 0b627be0d00..d80e0040caf 100644
--- a/app/code/core/Mage/Cms/etc/config.xml
+++ b/app/code/core/Mage/Cms/etc/config.xml
@@ -102,12 +102,14 @@
                         <jpeg>1</jpeg>
                         <png>1</png>
                         <gif>1</gif>
+                        <webp>1</webp>
                     </allowed>
                     <image_allowed>
                         <jpg>1</jpg>
                         <jpeg>1</jpeg>
                         <png>1</png>
                         <gif>1</gif>
+                        <webp>1</webp>
                     </image_allowed>
                     <media_allowed>
                         <flv>1</flv>
@@ -133,7 +135,6 @@
             </cms>
             <cms_resource>
                 <class>Mage_Cms_Model_Resource</class>
-                <deprecatedNode>cms_mysql4</deprecatedNode>
                 <entities>
                     <page>
                         <table>cms_page</table>
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index b9e1228037a..2005f24bfe4 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -1319,19 +1319,6 @@ public function getGroupedClassName($groupType, $classId, $groupRootNode = null)
         $className = '';
         if (isset($config->rewrite->$class)) {
             $className = (string)$config->rewrite->$class;
-        } else {
-            /**
-             * Backwards compatibility for pre-MMDB extensions.
-             * In MMDB release resource nodes <..._mysql4> were renamed to <..._resource>. So <deprecatedNode> is left
-             * to keep name of previously used nodes, that still may be used by non-updated extensions.
-             */
-            if (isset($config->deprecatedNode)) {
-                $deprecatedNode = $config->deprecatedNode;
-                $configOld = $this->_xml->global->{$groupType . 's'}->$deprecatedNode;
-                if (isset($configOld->rewrite->$class)) {
-                    $className = (string) $configOld->rewrite->$class;
-                }
-            }
         }
 
         $className = trim($className);
diff --git a/app/code/core/Mage/Core/Model/File/Validator/Image.php b/app/code/core/Mage/Core/Model/File/Validator/Image.php
index 9b0d6acd210..1a7e6658e2a 100644
--- a/app/code/core/Mage/Core/Model/File/Validator/Image.php
+++ b/app/code/core/Mage/Core/Model/File/Validator/Image.php
@@ -24,6 +24,7 @@ class Mage_Core_Model_File_Validator_Image
     public const NAME = "isImage";
 
     protected $_allowedImageTypes = [
+        IMAGETYPE_WEBP,
         IMAGETYPE_JPEG,
         IMAGETYPE_GIF,
         IMAGETYPE_JPEG2000,
@@ -42,6 +43,7 @@ class Mage_Core_Model_File_Validator_Image
     public function setAllowedImageTypes(array $imageFileExtensions = [])
     {
         $map = [
+            'webp' => [IMAGETYPE_WEBP],
             'tif' => [IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM],
             'tiff' => [IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM],
             'jpg' => [IMAGETYPE_JPEG, IMAGETYPE_JPEG2000],
@@ -121,6 +123,9 @@ public function validate($filePath)
                         case IMAGETYPE_JPEG:
                             imagejpeg($img, $filePath, $imageQuality);
                             break;
+                        case IMAGETYPE_WEBP:
+                            imagewebp($img, $filePath, $imageQuality);
+                            break;
                         case IMAGETYPE_PNG:
                             imagepng($img, $filePath);
                             break;
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
deleted file mode 100644
index b1a807d7376..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Abstract resource model class
- *
- * @category   Mage
- * @package    Mage_Core
- */
-abstract class Mage_Core_Model_Mysql4_Abstract extends Mage_Core_Model_Resource_Db_Abstract
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Cache.php b/app/code/core/Mage/Core/Model/Mysql4/Cache.php
deleted file mode 100644
index 63963fcf06a..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Cache.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Cache extends Mage_Core_Model_Resource_Cache
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
deleted file mode 100644
index c1d2ca83c31..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Abstract Core Resource Collection
- *
- * @category   Mage
- * @package    Mage_Core
- */
-class Mage_Core_Model_Mysql4_Collection_Abstract extends Mage_Core_Model_Resource_Db_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config.php b/app/code/core/Mage/Core/Model/Mysql4/Config.php
deleted file mode 100644
index c3cd97373f6..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Config.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Config extends Mage_Core_Model_Resource_Config
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
deleted file mode 100644
index b27b56469dd..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Config_Data extends Mage_Core_Model_Resource_Config_Data
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
deleted file mode 100644
index fab8dec1505..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Config data collection
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Config_Data_Collection extends Mage_Core_Model_Resource_Config_Data_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design.php b/app/code/core/Mage/Core/Model/Mysql4/Design.php
deleted file mode 100644
index e514f6ef087..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Design.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Design extends Mage_Core_Model_Resource_Design
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
deleted file mode 100644
index 05d349492cb..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Design_Collection extends Mage_Core_Model_Resource_Design_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
deleted file mode 100644
index c7d6b5f683f..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Design package collection
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Design_Package_Collection extends Mage_Core_Model_Resource_Design_Package_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
deleted file mode 100644
index 8b4b0121ae2..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- *
- * @method array getData(string $value)
- * @method $this setData(string $value, array $value)
- */
-class Mage_Core_Model_Mysql4_Design_Theme_Collection extends Varien_Directory_Collection
-{
-    /**
-     * @return $this
-     */
-    public function load()
-    {
-        $packages = $this->getData('themes');
-        if (is_null($packages)) {
-            $packages = Mage::getModel('core/design_package')->getThemeList();
-            $this->setData('themes', $packages);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function toOptionArray()
-    {
-        $options = [];
-        $packages = $this->getData('themes');
-        foreach ($packages as $package) {
-            $options[] = ['value' => $package, 'label' => $package];
-        }
-        array_unshift($options, ['value' => '', 'label' => '']);
-
-        return $options;
-    }
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
deleted file mode 100644
index 30d1a420826..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Template db resource
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Email_Template extends Mage_Core_Model_Resource_Email_Template
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
deleted file mode 100644
index afd9a855af9..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Templates collection
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Email_Template_Collection extends Mage_Core_Model_Resource_Email_Template_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php
deleted file mode 100644
index 1212c28057f..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Abstract storage resource model
- *
- * @category   Mage
- * @package    Mage_Core
- */
-abstract class Mage_Core_Model_Mysql4_File_Storage_Abstract extends Mage_Core_Model_Resource_File_Storage_Abstract
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php
deleted file mode 100644
index 4d0db4a57b6..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * File storage database resource model class
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_File_Storage_Database extends Mage_Core_Model_Resource_File_Storage_Database
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php
deleted file mode 100644
index 82d4e40147d..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Directory storage database resource model class
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_File_Storage_Directory_Database extends Mage_Core_Model_Resource_File_Storage_Directory_Database
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php
deleted file mode 100644
index a5499f15ef5..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Model for synchronization from DB to filesystem
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_File_Storage_File extends Mage_Core_Model_Resource_File_Storage_File
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Flag.php b/app/code/core/Mage/Core/Model/Mysql4/Flag.php
deleted file mode 100644
index e37c8be3d3b..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Flag.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Flag extends Mage_Core_Model_Resource_Flag
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language.php b/app/code/core/Mage/Core/Model/Mysql4/Language.php
deleted file mode 100644
index ebb010fa8e0..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Language.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Language extends Mage_Core_Model_Resource_Language
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
deleted file mode 100644
index 03455873e0d..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Language_Collection extends Mage_Core_Model_Resource_Language_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Layout.php b/app/code/core/Mage/Core/Model/Mysql4/Layout.php
deleted file mode 100644
index 929eeae6ac9..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Layout.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Layout extends Mage_Core_Model_Resource_Layout
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Resource.php b/app/code/core/Mage/Core/Model/Mysql4/Resource.php
deleted file mode 100644
index 9693a2b635f..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Resource.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mysql Model for module
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Resource extends Mage_Core_Model_Resource_Resource
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php
deleted file mode 100644
index 9bc8d72c63f..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Session.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mysql4 session save handler
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Session extends Mage_Core_Model_Resource_Session
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store.php b/app/code/core/Mage/Core/Model/Mysql4/Store.php
deleted file mode 100644
index 9f61e0feda6..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Store.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Store extends Mage_Core_Model_Resource_Store
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
deleted file mode 100644
index 36fc1ae0b63..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Stores collection
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Store_Collection extends Mage_Core_Model_Resource_Store_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
deleted file mode 100644
index 4e2e97422fa..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Store group resource model
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Store_Group extends Mage_Core_Model_Resource_Store_Group
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
deleted file mode 100644
index 3887323fed1..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Store group collection
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Store_Group_Collection extends Mage_Core_Model_Resource_Store_Group_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php
deleted file mode 100644
index 2fc7e4e46df..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Translation resource model
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Translate extends Mage_Core_Model_Resource_Translate
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
deleted file mode 100644
index 0c9478de177..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * String translate resource model
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Translate_String extends Mage_Core_Model_Resource_Translate_String
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
deleted file mode 100644
index 207eff71bfd..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Url rewrite resource model class
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Url_Rewrite extends Mage_Core_Model_Resource_Url_Rewrite
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
deleted file mode 100644
index 006cc4c5c3f..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Url rewrite resource collection model class
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Url_Rewrite_Collection extends Mage_Core_Model_Resource_Url_Rewrite_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable.php b/app/code/core/Mage/Core/Model/Mysql4/Variable.php
deleted file mode 100644
index 7a3e7aa7f87..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Variable.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Custom variable resource model
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Variable extends Mage_Core_Model_Resource_Variable
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php
deleted file mode 100644
index bb332dca6c2..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Custom variabel collection
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Variable_Collection extends Mage_Core_Model_Resource_Variable_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php
deleted file mode 100644
index ea646611115..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Website.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Website extends Mage_Core_Model_Resource_Website
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
deleted file mode 100644
index 3fee87358d4..00000000000
--- a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Core
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Websites collection
- *
- * @category   Mage
- * @package    Mage_Core
- * @deprecated
- */
-class Mage_Core_Model_Mysql4_Website_Collection extends Mage_Core_Model_Resource_Website_Collection
-{
-}
diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php
index 6e843ce8de5..7167f930de8 100644
--- a/app/code/core/Mage/Core/Model/Resource.php
+++ b/app/code/core/Mage/Core/Model/Resource.php
@@ -227,22 +227,7 @@ public function getConnectionTypeInstance($type)
      */
     public function getEntity($model, $entity)
     {
-        $modelsNode = Mage::getConfig()->getNode()->global->models;
-        $entityConfig = $modelsNode->$model->entities->{$entity};
-
-        /**
-         * Backwards compatibility for pre-MMDB extensions.
-         * In MMDB release resource nodes <..._mysql4> were renamed to <..._resource>. So <deprecatedNode> is left
-         * to keep name of previously used nodes, that still may be used by non-updated extensions.
-         */
-        if (isset($modelsNode->$model->deprecatedNode)) {
-            $deprecatedNode = $modelsNode->$model->deprecatedNode;
-            if (isset($modelsNode->$deprecatedNode->entities->$entity)) {
-                $entityConfig = $modelsNode->$deprecatedNode->entities->$entity;
-            }
-        }
-
-        return $entityConfig;
+        return Mage::getConfig()->getNode()->global->models->$model->entities->{$entity};
     }
 
     /**
diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
deleted file mode 100644
index 54250b36f37..00000000000
--- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Cron
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Schedule mysql4 resource
- *
- * @category   Mage
- * @package    Mage_Cron
- * @deprecated
- */
-class Mage_Cron_Model_Mysql4_Schedule extends Mage_Cron_Model_Resource_Schedule
-{
-}
diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
deleted file mode 100644
index a7e284f6c28..00000000000
--- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Cron
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Schedules Collection
- *
- * @category   Mage
- * @package    Mage_Cron
- * @deprecated
- */
-class Mage_Cron_Model_Mysql4_Schedule_Collection extends Mage_Cron_Model_Resource_Schedule_Collection
-{
-}
diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml
index ad4fe053ce7..41bf85c73ff 100644
--- a/app/code/core/Mage/Cron/etc/config.xml
+++ b/app/code/core/Mage/Cron/etc/config.xml
@@ -35,7 +35,6 @@
             </cron>
             <cron_resource>
                 <class>Mage_Cron_Model_Resource</class>
-                <deprecatedNode>cron_mysql4</deprecatedNode>
                 <entities>
                     <schedule>
                         <table>cron_schedule</table>
diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml
index 9d81eb34965..ed71840b322 100644
--- a/app/code/core/Mage/Customer/etc/config.xml
+++ b/app/code/core/Mage/Customer/etc/config.xml
@@ -344,7 +344,6 @@
             </customer>
             <customer_resource>
                 <class>Mage_Customer_Model_Resource</class>
-                <deprecatedNode>customer_mysql4</deprecatedNode>
                 <entities>
                     <entity>
                         <table>customer_entity</table>
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
deleted file mode 100644
index 6fdf9713622..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Dataflow Batch resource model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Batch extends Mage_Dataflow_Model_Resource_Batch
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
deleted file mode 100644
index be3a7169723..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Dataflow Batch abstract resource model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- */
-abstract class Mage_Dataflow_Model_Mysql4_Batch_Abstract extends Mage_Dataflow_Model_Resource_Batch_Abstract
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
deleted file mode 100644
index 22895d952ae..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Dataflow batch collection
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Batch_Collection extends Mage_Dataflow_Model_Resource_Batch_Collection
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
deleted file mode 100644
index c7aae18205c..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Dataflow Batch export resource model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Batch_Export extends Mage_Dataflow_Model_Resource_Batch_Export
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
deleted file mode 100644
index c8983e48174..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Dataflow Batch import resource model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Batch_Import extends Mage_Dataflow_Model_Resource_Batch_Import
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
deleted file mode 100644
index bffb2c91784..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * DataFlow Import resource model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Import extends Mage_Dataflow_Model_Resource_Import
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
deleted file mode 100644
index 2d5415791bb..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Import collection
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Import_Collection extends Mage_Dataflow_Model_Resource_Import_Collection
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
deleted file mode 100644
index 098ed259e3d..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Convert profile resource model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Profile extends Mage_Dataflow_Model_Resource_Profile
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
deleted file mode 100644
index d52d96d4c73..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Convert profile collection
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Profile_Collection extends Mage_Dataflow_Model_Resource_Profile_Collection
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
deleted file mode 100644
index 1951ec10daa..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Convert history resource model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Profile_History extends Mage_Dataflow_Model_Resource_Profile_History
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
deleted file mode 100644
index 3dddc50e6c2..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Convert history collection
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Profile_History_Collection extends Mage_Dataflow_Model_Resource_Profile_History_Collection
-{
-}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
deleted file mode 100644
index 3024d6cb338..00000000000
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * DataFlow Session Resource Model
- *
- * @category   Mage
- * @package    Mage_Dataflow
- * @deprecated
- */
-class Mage_Dataflow_Model_Mysql4_Session extends Mage_Dataflow_Model_Resource_Session
-{
-}
diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml
index 44a2620e489..9e7b7778a2f 100644
--- a/app/code/core/Mage/Dataflow/etc/config.xml
+++ b/app/code/core/Mage/Dataflow/etc/config.xml
@@ -28,7 +28,6 @@
             </dataflow>
             <dataflow_resource>
                 <class>Mage_Dataflow_Model_Resource</class>
-                <deprecatedNode>dataflow_mysql4</deprecatedNode>
                 <entities>
                     <session>
                         <table>dataflow_session</table>
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country.php b/app/code/core/Mage/Directory/Model/Mysql4/Country.php
deleted file mode 100644
index b682d42cc34..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Country extends Mage_Directory_Model_Resource_Country
-{
-}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
deleted file mode 100644
index 98c0346a2bb..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Country Collection
- *
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Country_Collection extends Mage_Directory_Model_Resource_Country_Collection
-{
-}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
deleted file mode 100644
index 48e98c660e2..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Directory country format resource model
- *
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Country_Format extends Mage_Directory_Model_Resource_Country_Format
-{
-}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
deleted file mode 100644
index e0d1bf7cc7c..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Directory country format resource model
- *
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Country_Format_Collection extends Mage_Directory_Model_Resource_Country_Format_Collection
-{
-}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
deleted file mode 100644
index 8727adf48ff..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Currency Mysql4 resourcre model
- *
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Currency extends Mage_Directory_Model_Resource_Currency
-{
-}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
deleted file mode 100644
index 43423cc9a75..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Currency Mysql4 collection model
- *
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Currency_Collection extends Mage_Directory_Model_Resource_Currency_Collection
-{
-}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region.php b/app/code/core/Mage/Directory/Model/Mysql4/Region.php
deleted file mode 100644
index 33bca082486..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Region extends Mage_Directory_Model_Resource_Region
-{
-}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
deleted file mode 100644
index 24116c00cd2..00000000000
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Directory
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Country collection
- *
- * @category   Mage
- * @package    Mage_Directory
- * @deprecated
- */
-class Mage_Directory_Model_Mysql4_Region_Collection extends Mage_Directory_Model_Resource_Region_Collection
-{
-}
diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml
index 753488229a1..5410e1948f8 100644
--- a/app/code/core/Mage/Directory/etc/config.xml
+++ b/app/code/core/Mage/Directory/etc/config.xml
@@ -51,7 +51,6 @@
             </directory>
             <directory_resource>
                 <class>Mage_Directory_Model_Resource</class>
-                <deprecatedNode>directory_mysql4</deprecatedNode>
                 <entities>
                     <country>
                         <table>directory_country</table>
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 31de8eb27c8..cfa8ea78124 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -227,7 +227,7 @@ public function getLinkData()
      */
     public function getPriceValue($value)
     {
-        return number_format($value, 2, null, '');
+        return number_format($value ?? 0, 2, null, '');
     }
 
     /**
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php
deleted file mode 100644
index 63865a3a5ef..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable products Price indexer resource model
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Indexer_Price extends Mage_Downloadable_Model_Resource_Indexer_Price
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php
deleted file mode 100644
index c78948c331d..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable Product  Samples resource model
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Link extends Mage_Downloadable_Model_Resource_Link
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php
deleted file mode 100644
index 8617aa5f15f..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable links resource collection
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Link_Collection extends Mage_Downloadable_Model_Resource_Link_Collection
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php
deleted file mode 100644
index ad8ed4e4144..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable Product link purchased resource model
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Link_Purchased extends Mage_Downloadable_Model_Resource_Link_Purchased
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php
deleted file mode 100644
index 69f6f12eee0..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable links purchased resource collection
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Link_Purchased_Collection extends Mage_Downloadable_Model_Resource_Link_Purchased_Collection
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php
deleted file mode 100644
index f1b3e23ca54..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable Product link purchased items resource model
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Link_Purchased_Item extends Mage_Downloadable_Model_Resource_Link_Purchased_Item
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php
deleted file mode 100644
index 21ffcb26da6..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable links purchased items resource collection
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Link_Purchased_Item_Collection extends Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php
deleted file mode 100644
index b4b30dc482d..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable Product  Samples resource model
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Sample extends Mage_Downloadable_Model_Resource_Sample
-{
-}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php
deleted file mode 100644
index 356586e17c7..00000000000
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Downloadable samples resource collection
- *
- * @category   Mage
- * @package    Mage_Downloadable
- * @deprecated
- */
-class Mage_Downloadable_Model_Mysql4_Sample_Collection extends Mage_Downloadable_Model_Resource_Sample_Collection
-{
-}
diff --git a/app/code/core/Mage/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml
index 5add7c32ebe..79ee11e4878 100644
--- a/app/code/core/Mage/Downloadable/etc/config.xml
+++ b/app/code/core/Mage/Downloadable/etc/config.xml
@@ -91,7 +91,6 @@
             </downloadable>
             <downloadable_resource>
                 <class>Mage_Downloadable_Model_Resource</class>
-                <deprecatedNode>downloadable_mysql4</deprecatedNode>
                 <entities>
                     <link>
                         <table>downloadable_link</table>
@@ -132,7 +131,7 @@
             <downloadable_setup>
                 <setup>
                     <module>Mage_Downloadable</module>
-                    <class>Mage_Catalog_Model_Resource_Eav_Mysql4_Setup</class>
+                    <class>Mage_Catalog_Model_Resource_Setup</class>
                 </setup>
             </downloadable_setup>
         </resources>
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php
index 98829283255..8d5fbe1f43a 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php
@@ -47,6 +47,7 @@ protected function _validateByRules($value)
             1   => 'gif',
             2   => 'jpg',
             3   => 'png',
+            18  => 'webp'
         ];
 
         if (!isset($allowImageTypes[$imageProp[2]])) {
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Config.php b/app/code/core/Mage/Eav/Model/Mysql4/Config.php
deleted file mode 100644
index 60eee624ded..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Config.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Config extends Mage_Eav_Model_Resource_Config
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
deleted file mode 100644
index 11d0254f3e9..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * EAV attribute model
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute extends Mage_Eav_Model_Resource_Entity_Attribute
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
deleted file mode 100644
index 33bd34a1452..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * EAV attribute resource collection
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
deleted file mode 100644
index 2c08644903d..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute_Group extends Mage_Eav_Model_Resource_Entity_Attribute_Group
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
deleted file mode 100644
index d9d82a337df..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute_Group_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
deleted file mode 100644
index 6054a390dff..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Entity attribute option resource model
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute_Option extends Mage_Eav_Model_Resource_Entity_Attribute_Option
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
deleted file mode 100644
index c0c97e0e6ac..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Entity attribute option collection
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute_Option_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
deleted file mode 100644
index 7bfe2a1d501..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav attribute set resource model
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute_Set extends Mage_Eav_Model_Resource_Entity_Attribute_Set
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
deleted file mode 100644
index 29e15cc4b91..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Attribute_Set_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
deleted file mode 100644
index 90969544f53..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Store extends Mage_Eav_Model_Resource_Entity_Store
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
deleted file mode 100644
index 46b6e164532..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * EAV entity type resource model
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Type extends Mage_Eav_Model_Resource_Entity_Type
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
deleted file mode 100644
index 96a737c4cfb..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Entity_Type_Collection extends Mage_Eav_Model_Resource_Entity_Type_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php
deleted file mode 100644
index 6688679a26e..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav Form Element Resource Model
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Form_Element extends Mage_Eav_Model_Resource_Form_Element
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php
deleted file mode 100644
index 840179fce6c..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav Form Element Resource Collection
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Form_Element_Collection extends Mage_Eav_Model_Resource_Form_Element_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php
deleted file mode 100644
index 8d2ee9cdabf..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav Form Fieldset Resource Model
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Form_Fieldset extends Mage_Eav_Model_Resource_Form_Fieldset
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php
deleted file mode 100644
index 9d86a0a48e9..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav Form Fieldset Resource Collection
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Form_Fieldset_Collection extends Mage_Eav_Model_Resource_Form_Fieldset_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php
deleted file mode 100644
index 3cfc8086ac2..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav Form Type Resource Model
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Form_Type extends Mage_Eav_Model_Resource_Form_Type
-{
-}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php
deleted file mode 100644
index 21fecef5ae0..00000000000
--- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Eav
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Eav Form Type Resource Collection
- *
- * @category   Mage
- * @package    Mage_Eav
- * @deprecated
- */
-class Mage_Eav_Model_Mysql4_Form_Type_Collection extends Mage_Eav_Model_Resource_Form_Type_Collection
-{
-}
diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml
index 289129ea14d..eb0e2cabc1d 100644
--- a/app/code/core/Mage/Eav/etc/config.xml
+++ b/app/code/core/Mage/Eav/etc/config.xml
@@ -28,7 +28,6 @@
             </eav>
             <eav_resource>
                 <class>Mage_Eav_Model_Resource</class>
-                <deprecatedNode>eav_mysql4</deprecatedNode>
                 <entities>
                     <entity>
                         <table>eav_entity</table>
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
deleted file mode 100644
index 834293badd3..00000000000
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_GiftMessage
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Gift Message resource model
- *
- * @category   Mage
- * @package    Mage_GiftMessage
- * @deprecated
- */
-class Mage_GiftMessage_Model_Mysql4_Message extends Mage_GiftMessage_Model_Resource_Message
-{
-}
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
deleted file mode 100644
index fe4dd831748..00000000000
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_GiftMessage
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Gift Message collection
- *
- * @category   Mage
- * @package    Mage_GiftMessage
- * @deprecated
- */
-class Mage_GiftMessage_Model_Mysql4_Message_Collection extends Mage_GiftMessage_Model_Resource_Message_Collection
-{
-}
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
deleted file mode 100644
index 4d5852d1649..00000000000
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_GiftMessage
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Gift Message resource setup
- *
- * @category   Mage
- * @package    Mage_GiftMessage
- * @deprecated
- */
-class Mage_GiftMessage_Model_Mysql4_Setup extends Mage_GiftMessage_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml
index 2bd75b9c371..0f991189327 100644
--- a/app/code/core/Mage/GiftMessage/etc/config.xml
+++ b/app/code/core/Mage/GiftMessage/etc/config.xml
@@ -38,7 +38,6 @@
             </giftmessage>
             <giftmessage_resource>
                 <class>Mage_GiftMessage_Model_Resource</class>
-                <deprecatedNode>giftmessage_mysql4</deprecatedNode>
                 <entities>
                     <message>
                         <table>gift_message</table>
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
index 5304f508d4c..f5720ee6e37 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
@@ -24,6 +24,7 @@ class Mage_ImportExport_Model_Import_Uploader extends Mage_Core_Model_File_Uploa
     protected $_tmpDir  = '';
     protected $_destDir = '';
     protected $_allowedMimeTypes = [
+        'webp' => 'image/webp',
         'jpg' => 'image/jpeg',
         'jpeg' => 'image/jpeg',
         'gif' => 'image/gif',
diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php
deleted file mode 100644
index 44b44902de8..00000000000
--- a/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ImportExport
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Source import data model
- *
- * @category   Mage
- * @package    Mage_ImportExport
- * @deprecated
- */
-class Mage_ImportExport_Model_Mysql4_Import_Data extends Mage_ImportExport_Model_Resource_Import_Data
-{
-}
diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php
deleted file mode 100644
index f262f184f03..00000000000
--- a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ImportExport
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * ImportExport setup model
- *
- * @category   Mage
- * @package    Mage_ImportExport
- * @deprecated
- */
-class Mage_ImportExport_Model_Mysql4_Setup extends Mage_ImportExport_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Index/Model/Mysql4/Abstract.php b/app/code/core/Mage/Index/Model/Mysql4/Abstract.php
deleted file mode 100644
index af2afe40705..00000000000
--- a/app/code/core/Mage/Index/Model/Mysql4/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Index
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Abstract resource model. Can be used as base for indexer resources
- *
- * @category   Mage
- * @package    Mage_Index
- */
-abstract class Mage_Index_Model_Mysql4_Abstract extends Mage_Index_Model_Resource_Abstract
-{
-}
diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event.php b/app/code/core/Mage/Index/Model/Mysql4/Event.php
deleted file mode 100644
index ad8a4108888..00000000000
--- a/app/code/core/Mage/Index/Model/Mysql4/Event.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Index
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Index
- * @deprecated
- */
-class Mage_Index_Model_Mysql4_Event extends Mage_Index_Model_Resource_Event
-{
-}
diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php
deleted file mode 100644
index 994a67095f2..00000000000
--- a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Index
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Index
- * @deprecated
- */
-class Mage_Index_Model_Mysql4_Event_Collection extends Mage_Index_Model_Resource_Event_Collection
-{
-}
diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process.php b/app/code/core/Mage/Index/Model/Mysql4/Process.php
deleted file mode 100644
index 98ea6188dc0..00000000000
--- a/app/code/core/Mage/Index/Model/Mysql4/Process.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Index
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Index
- * @deprecated
- */
-class Mage_Index_Model_Mysql4_Process extends Mage_Index_Model_Resource_Process
-{
-}
diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php
deleted file mode 100644
index 9d0778b976e..00000000000
--- a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Index
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Index
- * @deprecated
- */
-class Mage_Index_Model_Mysql4_Process_Collection extends Mage_Index_Model_Resource_Process_Collection
-{
-}
diff --git a/app/code/core/Mage/Index/Model/Mysql4/Setup.php b/app/code/core/Mage/Index/Model/Mysql4/Setup.php
deleted file mode 100644
index 85df4263bb9..00000000000
--- a/app/code/core/Mage/Index/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Index
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Index
- * @deprecated
- */
-class Mage_Index_Model_Mysql4_Setup extends Mage_Index_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml
index 94e1aa18f54..7e37c883bb6 100644
--- a/app/code/core/Mage/Index/etc/config.xml
+++ b/app/code/core/Mage/Index/etc/config.xml
@@ -45,7 +45,6 @@
             </index>
             <index_resource>
                 <class>Mage_Index_Model_Resource</class>
-                <deprecatedNode>index_mysql4</deprecatedNode>
                 <entities>
                     <event>
                         <table>index_event</table>
diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml
index 8530388ff76..0878b47dd7f 100644
--- a/app/code/core/Mage/Install/etc/config.xml
+++ b/app/code/core/Mage/Install/etc/config.xml
@@ -28,7 +28,6 @@
             </install>
             <install_resource>
                 <class>Mage_Install_Model_Resource</class>
-                <deprecatedNode>install_mysql4</deprecatedNode>
             </install_resource>
         </models>
         <blocks>
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php
deleted file mode 100644
index f0422d59fa0..00000000000
--- a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Log
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Log
- * @deprecated
- */
-class Mage_Log_Model_Mysql4_Aggregation extends Mage_Log_Model_Resource_Aggregation
-{
-}
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Customer.php b/app/code/core/Mage/Log/Model/Mysql4/Customer.php
deleted file mode 100644
index f53f9df4b21..00000000000
--- a/app/code/core/Mage/Log/Model/Mysql4/Customer.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Log
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Customer log resource
- *
- * @category   Mage
- * @package    Mage_Log
- * @deprecated
- */
-class Mage_Log_Model_Mysql4_Customer extends Mage_Log_Model_Resource_Customer
-{
-}
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Log.php b/app/code/core/Mage/Log/Model/Mysql4/Log.php
deleted file mode 100644
index fe387b5c9a7..00000000000
--- a/app/code/core/Mage/Log/Model/Mysql4/Log.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Log
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Log Resource Model
- *
- * @category   Mage
- * @package    Mage_Log
- * @deprecated
- */
-class Mage_Log_Model_Mysql4_Log extends Mage_Log_Model_Resource_Log
-{
-}
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php
deleted file mode 100644
index 8a0dad72297..00000000000
--- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Log
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Visitor log resource
- *
- * @category   Mage
- * @package    Mage_Log
- * @deprecated
- */
-class Mage_Log_Model_Mysql4_Visitor extends Mage_Log_Model_Resource_Visitor
-{
-}
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php
deleted file mode 100644
index 28b1d7f74dd..00000000000
--- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Log
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mage_Log_Model_Mysql4_Customers_Collection
- *
- * @category   Mage
- * @package    Mage_Log
- * @deprecated
- */
-class Mage_Log_Model_Mysql4_Visitor_Collection extends Mage_Log_Model_Resource_Visitor_Collection
-{
-}
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php
deleted file mode 100644
index a3d784ce470..00000000000
--- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Log
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Log Prepare Online visitors resource collection
- *
- * @category   Mage
- * @package    Mage_Log
- * @deprecated
- */
-class Mage_Log_Model_Mysql4_Visitor_Online extends Mage_Log_Model_Resource_Visitor_Online
-{
-}
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php
deleted file mode 100644
index ac90a4e4be4..00000000000
--- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Log
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Log Online visitors collection
- *
- * @category   Mage
- * @package    Mage_Log
- * @deprecated
- */
-class Mage_Log_Model_Mysql4_Visitor_Online_Collection extends Mage_Log_Model_Resource_Visitor_Online_Collection
-{
-}
diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml
index f7119dd1259..70142829d98 100644
--- a/app/code/core/Mage/Log/etc/config.xml
+++ b/app/code/core/Mage/Log/etc/config.xml
@@ -64,7 +64,6 @@
             </log>
             <log_resource>
                 <class>Mage_Log_Model_Resource</class>
-                <deprecatedNode>log_mysql4</deprecatedNode>
                 <entities>
                     <customer>
                         <table>log_customer</table>
diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php
index e913a93a68b..0e36833a97a 100644
--- a/app/code/core/Mage/Media/Model/File/Image.php
+++ b/app/code/core/Mage/Media/Model/File/Image.php
@@ -92,6 +92,10 @@ public function getImage(Mage_Media_Model_Image $object)
                 $resource = imagecreatefromjpeg($object->getFilePath());
                 break;
 
+            case 'webp':
+                $resource = imagecreatefromwebp($object->getFilePath());
+                break;
+
             case 'gif':
                 $resource = imagecreatefromgif($object->getFilePath());
                 break;
@@ -176,6 +180,9 @@ public function saveAs(Mage_Media_Model_Image $object, $extension = null)
             case 'jpeg':
                 $result = imagejpeg($object->getTmpImage(), $object->getFilePath(true), 80);
                 break;
+            case 'webp':
+                $result = imagewebp($object->getTmpImage(), $object->getFilePath(true), 80);
+                break;
             case 'gif':
                 $result = imagegif($object->getTmpImage(), $object->getFilePath(true));
                 break;
diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml
index 0cd05a8c727..419906f6cb1 100644
--- a/app/code/core/Mage/Media/etc/config.xml
+++ b/app/code/core/Mage/Media/etc/config.xml
@@ -28,7 +28,6 @@
             </media>
             <media_resource>
                 <class>Mage_Media_Model_File</class>
-                <deprecatedNode>media_file</deprecatedNode>
             </media_resource>
         </models>
     </global>
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php
deleted file mode 100644
index c31796e63cd..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Mage newsletter problem resource model
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Problem extends Mage_Newsletter_Model_Resource_Problem
-{
-}
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php
deleted file mode 100644
index 01f05d8a7ea..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Newsletter problem model collection
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Problem_Collection extends Mage_Newsletter_Model_Resource_Problem_Collection
-{
-}
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php
deleted file mode 100644
index 4aca0b2f395..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Newsletter queue saver
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Queue extends Mage_Newsletter_Model_Resource_Queue
-{
-}
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php
deleted file mode 100644
index ac67b567a29..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Newsletter queue collection.
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Queue_Collection extends Mage_Newsletter_Model_Resource_Queue_Collection
-{
-}
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php
deleted file mode 100644
index a9a583ce130..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Newsletter subscriber model for MySQL4
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Subscriber extends Mage_Newsletter_Model_Resource_Subscriber
-{
-}
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php
deleted file mode 100644
index fff545e6a03..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Newsletter Subscribers Collection
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Subscriber_Collection extends Mage_Newsletter_Model_Resource_Subscriber_Collection
-{
-}
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php
deleted file mode 100644
index bfbf721ce1c..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Template db resource
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Template extends Mage_Newsletter_Model_Resource_Template
-{
-}
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php
deleted file mode 100644
index 5c843c4acc7..00000000000
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Templates collection
- *
- * @category   Mage
- * @package    Mage_Newsletter
- * @deprecated
- */
-class Mage_Newsletter_Model_Mysql4_Template_Collection extends Mage_Newsletter_Model_Resource_Template_Collection
-{
-}
diff --git a/app/code/core/Mage/Newsletter/etc/config.xml b/app/code/core/Mage/Newsletter/etc/config.xml
index 27bcaddb1fd..6b31d281764 100644
--- a/app/code/core/Mage/Newsletter/etc/config.xml
+++ b/app/code/core/Mage/Newsletter/etc/config.xml
@@ -33,7 +33,6 @@
             </newsletter>
             <newsletter_resource>
                 <class>Mage_Newsletter_Model_Resource</class>
-                <deprecatedNode>newsletter_mysql4</deprecatedNode>
                 <entities>
                     <subscriber>
                         <table>newsletter_subscriber</table>
diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php
deleted file mode 100644
index 6216c1d130c..00000000000
--- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Paygate
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Paygate
- * @deprecated
- */
-class Mage_Paygate_Model_Mysql4_Authorizenet_Debug extends Mage_Paygate_Model_Resource_Authorizenet_Debug
-{
-}
diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php
deleted file mode 100644
index 782f60f6282..00000000000
--- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Paygate
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Paygate
- * @deprecated
- */
-class Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection extends Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection
-{
-}
diff --git a/app/code/core/Mage/Paygate/etc/config.xml b/app/code/core/Mage/Paygate/etc/config.xml
index 0fbe17dec84..ae1dbf2537d 100644
--- a/app/code/core/Mage/Paygate/etc/config.xml
+++ b/app/code/core/Mage/Paygate/etc/config.xml
@@ -28,7 +28,6 @@
             </paygate>
             <paygate_resource>
                 <class>Mage_Paygate_Model_Resource</class>
-                <deprecatedNode>paygate_mysql4</deprecatedNode>
                 <entities>
                     <authorizenet_debug>
                         <table>paygate_authorizenet_debug</table>
diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php b/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php
deleted file mode 100644
index c63766e4ab6..00000000000
--- a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * PayPal resource model for certificate based authentication
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @deprecated
- */
-class Mage_Paypal_Model_Mysql4_Cert extends Mage_Paypal_Model_Resource_Cert
-{
-}
diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php
deleted file mode 100644
index b933ead7a67..00000000000
--- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Paypal
- * @deprecated
- */
-class Mage_Paypal_Model_Mysql4_Report_Settlement extends Mage_Paypal_Model_Resource_Report_Settlement
-{
-}
diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php
deleted file mode 100644
index aab9c04cb21..00000000000
--- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Paypal
- * @deprecated
- */
-class Mage_Paypal_Model_Mysql4_Report_Settlement_Row extends Mage_Paypal_Model_Resource_Report_Settlement_Row
-{
-}
diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php
deleted file mode 100644
index 06d516c00ce..00000000000
--- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Resource collection for report rows
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @deprecated
- */
-class Mage_Paypal_Model_Mysql4_Report_Settlement_Row_Collection extends Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection
-{
-}
diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php
deleted file mode 100644
index 447c4625331..00000000000
--- a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * PayPal Setup Resource class
- *
- * @category   Mage
- * @package    Mage_Paypal
- * @deprecated
- */
-class Mage_Paypal_Model_Mysql4_Setup extends Mage_Paypal_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php
deleted file mode 100644
index 81686cd0fe0..00000000000
--- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product alert for changed price resource model
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @deprecated
- */
-class Mage_ProductAlert_Model_Mysql4_Price extends Mage_ProductAlert_Model_Resource_Price
-{
-}
diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php
deleted file mode 100644
index 27b1865a5dc..00000000000
--- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product alert for changed price collection
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @deprecated
- */
-class Mage_ProductAlert_Model_Mysql4_Price_Collection extends Mage_ProductAlert_Model_Resource_Price_Collection
-{
-}
diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php
deleted file mode 100644
index 247f459046f..00000000000
--- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * ProductAlert Price Customer collection
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @deprecated
- */
-class Mage_ProductAlert_Model_Mysql4_Price_Customer_Collection extends Mage_ProductAlert_Model_Resource_Price_Customer_Collection
-{
-}
diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php
deleted file mode 100644
index f6e4bb7d67a..00000000000
--- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product alert for back in stock resource model
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @deprecated
- */
-class Mage_ProductAlert_Model_Mysql4_Stock extends Mage_ProductAlert_Model_Resource_Stock
-{
-}
diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php
deleted file mode 100644
index 8a26833b317..00000000000
--- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product alert for back in stock collection
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @deprecated
- */
-class Mage_ProductAlert_Model_Mysql4_Stock_Collection extends Mage_ProductAlert_Model_Resource_Stock_Collection
-{
-}
diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php
deleted file mode 100644
index 42a4ffc087b..00000000000
--- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * ProductAlert Stock Customer collection
- *
- * @category   Mage
- * @package    Mage_ProductAlert
- * @deprecated
- */
-class Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection extends Mage_ProductAlert_Model_Resource_Stock_Customer_Collection
-{
-}
diff --git a/app/code/core/Mage/ProductAlert/etc/config.xml b/app/code/core/Mage/ProductAlert/etc/config.xml
index 3221fc2f40a..7d3ad4ee4e3 100644
--- a/app/code/core/Mage/ProductAlert/etc/config.xml
+++ b/app/code/core/Mage/ProductAlert/etc/config.xml
@@ -28,7 +28,6 @@
             </productalert>
             <productalert_resource>
                 <class>Mage_ProductAlert_Model_Resource</class>
-                <deprecatedNode>productalert_mysql4</deprecatedNode>
                 <entities>
                     <price>
                         <table>product_alert_price</table>
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php
deleted file mode 100644
index e29a437451f..00000000000
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rating
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rating model
- *
- * @category   Mage
- * @package    Mage_Rating
- * @deprecated
- */
-class Mage_Rating_Model_Mysql4_Rating extends Mage_Rating_Model_Resource_Rating
-{
-}
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php
deleted file mode 100644
index f780b4afd59..00000000000
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rating
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rating collection resource model
- *
- * @category   Mage
- * @package    Mage_Rating
- * @deprecated
- */
-class Mage_Rating_Model_Mysql4_Rating_Collection extends Mage_Rating_Model_Resource_Rating_Collection
-{
-}
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php
deleted file mode 100644
index 1b2d54455a7..00000000000
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rating
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rating entity resource
- *
- * @category   Mage
- * @package    Mage_Rating
- * @deprecated
- */
-class Mage_Rating_Model_Mysql4_Rating_Entity extends Mage_Rating_Model_Resource_Rating_Entity
-{
-}
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php
deleted file mode 100644
index 2402f524e6b..00000000000
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rating
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rating option resource model
- *
- * @category   Mage
- * @package    Mage_Rating
- * @deprecated
- */
-class Mage_Rating_Model_Mysql4_Rating_Option extends Mage_Rating_Model_Resource_Rating_Option
-{
-}
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php
deleted file mode 100644
index 6537df2540a..00000000000
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rating
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rating option collection
- *
- * @category   Mage
- * @package    Mage_Rating
- * @deprecated
- */
-class Mage_Rating_Model_Mysql4_Rating_Option_Collection extends Mage_Rating_Model_Resource_Rating_Option_Collection
-{
-}
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php
deleted file mode 100644
index 17472f3fd28..00000000000
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rating
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rating vote resource model
- *
- * @category   Mage
- * @package    Mage_Rating
- * @deprecated
- */
-class Mage_Rating_Model_Mysql4_Rating_Option_Vote extends Mage_Rating_Model_Resource_Rating_Option_Vote
-{
-}
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php
deleted file mode 100644
index 5e473fc9e9f..00000000000
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rating
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rating votes collection
- *
- * @category   Mage
- * @package    Mage_Rating
- * @deprecated
- */
-class Mage_Rating_Model_Mysql4_Rating_Option_Vote_Collection extends Mage_Rating_Model_Resource_Rating_Option_Vote_Collection
-{
-}
diff --git a/app/code/core/Mage/Rating/etc/config.xml b/app/code/core/Mage/Rating/etc/config.xml
index ed4345a766c..61af46f6110 100644
--- a/app/code/core/Mage/Rating/etc/config.xml
+++ b/app/code/core/Mage/Rating/etc/config.xml
@@ -28,7 +28,6 @@
             </rating>
             <rating_resource>
                 <class>Mage_Rating_Model_Resource</class>
-                <deprecatedNode>rating_mysql4</deprecatedNode>
                 <entities>
                     <rating>
                         <table>rating</table>
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php
deleted file mode 100644
index b5435ecd5c8..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * New Accounts Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Accounts_Collection extends Mage_Reports_Model_Resource_Accounts_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php
deleted file mode 100644
index 9ddc3c0fc2f..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Coupons Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Coupons_Collection extends Mage_Reports_Model_Resource_Coupons_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php
deleted file mode 100644
index 02a0d640b5a..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Customers Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Customer_Collection extends Mage_Reports_Model_Resource_Customer_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php
deleted file mode 100644
index 499cd9146f2..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Customers by orders Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Customer_Orders_Collection extends Mage_Reports_Model_Resource_Customer_Orders_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php
deleted file mode 100644
index 0c977c17567..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Customers by totals Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Customer_Totals_Collection extends Mage_Reports_Model_Resource_Customer_Totals_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php
deleted file mode 100644
index 38f69ff1cb5..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports summary collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Entity_Summary_Collection_Abstract extends Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event.php b/app/code/core/Mage/Reports/Model/Mysql4/Event.php
deleted file mode 100644
index de0b94ac2da..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Event.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report events resource model
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Event extends Mage_Reports_Model_Resource_Event
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php
deleted file mode 100644
index d21555c7bf8..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report event collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Event_Collection extends Mage_Reports_Model_Resource_Event_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php
deleted file mode 100644
index 61bd62ee74a..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report event type resource model
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Event_Type extends Mage_Reports_Model_Resource_Event_Type
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php
deleted file mode 100644
index ec33f66c7c6..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report event types collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Event_Type_Collection extends Mage_Reports_Model_Resource_Event_Type_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php
deleted file mode 100644
index c6d2f15d4d4..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports invoiced collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Invoiced_Collection extends Mage_Reports_Model_Resource_Invoiced_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php
deleted file mode 100644
index 07689cca3df..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports orders collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Order_Collection extends Mage_Reports_Model_Resource_Order_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php
deleted file mode 100644
index 7fd53b83969..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Products Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Collection extends Mage_Reports_Model_Resource_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php
deleted file mode 100644
index 8c089a0d38b..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product Downloads Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Downloads_Collection extends Mage_Reports_Model_Resource_Product_Downloads_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php
deleted file mode 100644
index 18d3b58a4b0..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports Product Index Abstract Resource Model
- *
- * @category   Mage
- * @package    Mage_Reports
- */
-abstract class Mage_Reports_Model_Mysql4_Product_Index_Abstract extends Mage_Reports_Model_Resource_Product_Index_Abstract
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php
deleted file mode 100644
index 99b440c61b1..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports Product Index Abstract Product Resource Collection
- *
- * @category   Mage
- * @package    Mage_Reports
- */
-abstract class Mage_Reports_Model_Mysql4_Product_Index_Collection_Abstract extends Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php
deleted file mode 100644
index 47f86e5f42f..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports Compared Product Index Resource Model
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Index_Compared extends Mage_Reports_Model_Resource_Product_Index_Compared
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php
deleted file mode 100644
index 4dc30a4c18b..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports Compared Product Index Resource Collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Index_Compared_Collection extends Mage_Reports_Model_Resource_Product_Index_Compared_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php
deleted file mode 100644
index 0540f4d48d6..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports Viewed Product Index Resource Model
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Index_Viewed extends Mage_Reports_Model_Resource_Product_Index_Viewed
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php
deleted file mode 100644
index 2964940314a..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports Viewed Product Index Resource Collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Index_Viewed_Collection extends Mage_Reports_Model_Resource_Product_Index_Viewed_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php
deleted file mode 100644
index 26fd4580073..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Product Low Stock Report Collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Lowstock_Collection extends Mage_Reports_Model_Resource_Product_Lowstock_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php
deleted file mode 100644
index bc507515949..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Products Ordered (Bestsellers) Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Ordered_Collection extends Mage_Reports_Model_Resource_Product_Ordered_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php
deleted file mode 100644
index 80da45e79c1..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Sold Products collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Sold_Collection extends Mage_Reports_Model_Resource_Product_Sold_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php
deleted file mode 100644
index 534225a8567..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Products Most Viewed Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Product_Viewed_Collection extends Mage_Reports_Model_Resource_Product_Viewed_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php
deleted file mode 100644
index 8e6982f04af..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports quote collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Quote_Collection extends Mage_Reports_Model_Resource_Quote_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php
deleted file mode 100644
index 384f8e7b711..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports refunded collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Refunded_Collection extends Mage_Reports_Model_Resource_Refunded_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php
deleted file mode 100644
index a8ac2108f84..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Abstract report aggregate resource model
- *
- * @category   Mage
- * @package    Mage_Reports
- */
-abstract class Mage_Reports_Model_Mysql4_Report_Abstract extends Mage_Reports_Model_Resource_Report_Abstract
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php
deleted file mode 100644
index f362f622c00..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Reviews collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Report_Collection extends Mage_Reports_Model_Resource_Report_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php
deleted file mode 100644
index dcbc9a1db4e..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Reviews collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Review_Collection extends Mage_Reports_Model_Resource_Review_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php
deleted file mode 100644
index 651b7948bdd..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Customers Review collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Review_Customer_Collection extends Mage_Reports_Model_Resource_Review_Customer_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php
deleted file mode 100644
index 9bf0d66bebc..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Products Review collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Review_Product_Collection extends Mage_Reports_Model_Resource_Review_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php
deleted file mode 100644
index 080bba0b84f..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports orders collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Shipping_Collection extends Mage_Reports_Model_Resource_Shipping_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php
deleted file mode 100644
index 39838012e28..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Shopingcart Products Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated after 1.5.0.1
- */
-class Mage_Reports_Model_Mysql4_Shopcart_Product_Collection extends Mage_Reports_Model_Resource_Shopcart_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php
deleted file mode 100644
index bbfe0c44b24..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Products Tags collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Tag_Collection extends Mage_Reports_Model_Resource_Tag_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php
deleted file mode 100644
index 206fb2f8a54..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Customers Tags collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Tag_Customer_Collection extends Mage_Reports_Model_Resource_Tag_Customer_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php
deleted file mode 100644
index f6f8bd1d760..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report Products Tags collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Tag_Product_Collection extends Mage_Reports_Model_Resource_Tag_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php
deleted file mode 100644
index 6b74151ff08..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Reports tax collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Tax_Collection extends Mage_Reports_Model_Resource_Tax_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php
deleted file mode 100644
index 779ca6cfc57..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Wishlist Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Wishlist_Collection extends Mage_Reports_Model_Resource_Wishlist_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php
deleted file mode 100644
index 59cb0ea7692..00000000000
--- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Reports
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Wishlist Report collection
- *
- * @category   Mage
- * @package    Mage_Reports
- * @deprecated
- */
-class Mage_Reports_Model_Mysql4_Wishlist_Product_Collection extends Mage_Reports_Model_Resource_Wishlist_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml
index c3de0daf8a2..e52e246efaf 100644
--- a/app/code/core/Mage/Reports/etc/config.xml
+++ b/app/code/core/Mage/Reports/etc/config.xml
@@ -28,7 +28,6 @@
             </reports>
             <reports_resource>
                 <class>Mage_Reports_Model_Resource</class>
-                <deprecatedNode>reports_mysql4</deprecatedNode>
                 <entities>
                     <event>
                         <table>report_event</table>
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review.php b/app/code/core/Mage/Review/Model/Mysql4/Review.php
deleted file mode 100644
index a342935f91c..00000000000
--- a/app/code/core/Mage/Review/Model/Mysql4/Review.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Review
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Review resource model
- *
- * @category   Mage
- * @package    Mage_Review
- * @deprecated
- */
-class Mage_Review_Model_Mysql4_Review extends Mage_Review_Model_Resource_Review
-{
-}
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php
deleted file mode 100644
index a3bfb752c31..00000000000
--- a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Review
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Review collection resource model
- *
- * @category   Mage
- * @package    Mage_Review
- * @deprecated
- */
-class Mage_Review_Model_Mysql4_Review_Collection extends Mage_Review_Model_Resource_Review_Collection
-{
-}
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php
deleted file mode 100644
index 6c90f529c44..00000000000
--- a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Review
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Review Product Collection
- *
- * @category   Mage
- * @package    Mage_Review
- * @deprecated
- */
-class Mage_Review_Model_Mysql4_Review_Product_Collection extends Mage_Review_Model_Resource_Review_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php
deleted file mode 100644
index c98dbaf16b8..00000000000
--- a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Review
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Review sttuses collection
- *
- * @category   Mage
- * @package    Mage_Review
- * @deprecated
- */
-class Mage_Review_Model_Mysql4_Review_Status_Collection extends Mage_Review_Model_Resource_Review_Status_Collection
-{
-}
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php
deleted file mode 100644
index ffe21ef5f6e..00000000000
--- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Review
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Review summary resource model
- *
- * @category   Mage
- * @package    Mage_Review
- * @deprecated
- */
-class Mage_Review_Model_Mysql4_Review_Summary extends Mage_Review_Model_Resource_Review_Summary
-{
-}
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php
deleted file mode 100644
index 9322348a723..00000000000
--- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Review
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Review summery collection
- *
- * @category   Mage
- * @package    Mage_Review
- * @deprecated
- */
-class Mage_Review_Model_Mysql4_Review_Summary_Collection extends Mage_Review_Model_Resource_Review_Summary_Collection
-{
-}
diff --git a/app/code/core/Mage/Review/etc/config.xml b/app/code/core/Mage/Review/etc/config.xml
index 085dcd5d717..6a481688363 100644
--- a/app/code/core/Mage/Review/etc/config.xml
+++ b/app/code/core/Mage/Review/etc/config.xml
@@ -28,7 +28,6 @@
             </review>
             <review_resource>
                 <class>Mage_Review_Model_Resource</class>
-                <deprecatedNode>review_mysql4</deprecatedNode>
                 <entities>
                     <review>
                         <table>review</table>
diff --git a/app/code/core/Mage/Rss/Model/Mysql4/Order.php b/app/code/core/Mage/Rss/Model/Mysql4/Order.php
deleted file mode 100644
index 9a00c57684d..00000000000
--- a/app/code/core/Mage/Rss/Model/Mysql4/Order.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rss
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order Rss Resource Model
- *
- * @category   Mage
- * @package    Mage_Rss
- * @deprecated
- */
-class Mage_Rss_Model_Mysql4_Order extends Mage_Rss_Model_Resource_Order
-{
-}
diff --git a/app/code/core/Mage/Rss/etc/config.xml b/app/code/core/Mage/Rss/etc/config.xml
index 64e9ed4f655..b8486b5e0de 100644
--- a/app/code/core/Mage/Rss/etc/config.xml
+++ b/app/code/core/Mage/Rss/etc/config.xml
@@ -28,7 +28,6 @@
             </rss>
             <rss_resource>
                 <class>Mage_Rss_Model_Resource</class>
-                <deprecatedNode>rss_mysql4</deprecatedNode>
             </rss_resource>
         </models>
         <blocks>
diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php
deleted file mode 100644
index 335bba27a82..00000000000
--- a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote rule mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Rule
- * @deprecated
- */
-class Mage_Rule_Model_Mysql4_Rule extends Mage_Rule_Model_Resource_Rule
-{
-}
diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php
deleted file mode 100644
index 9cafb1d9ea8..00000000000
--- a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Rule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Abstract rules collection to be extended
- *
- * @category   Mage
- * @package    Mage_Rule
- * @deprecated
- */
-class Mage_Rule_Model_Mysql4_Rule_Collection extends Mage_Rule_Model_Resource_Rule_Collection
-{
-}
diff --git a/app/code/core/Mage/Rule/etc/config.xml b/app/code/core/Mage/Rule/etc/config.xml
index dc6ae08824a..6469687a779 100644
--- a/app/code/core/Mage/Rule/etc/config.xml
+++ b/app/code/core/Mage/Rule/etc/config.xml
@@ -28,7 +28,6 @@
             </rule>
             <rule_resource>
                 <class>Mage_Rule_Model_Resource</class>
-                <deprecatedNode>rule_mysql4</deprecatedNode>
             </rule_resource>
         </models>
         <blocks>
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php
deleted file mode 100644
index 6f8e8ccdbbc..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales mysql4 abstract resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- */
-abstract class Mage_Sales_Model_Mysql4_Abstract extends Mage_Sales_Model_Resource_Abstract
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php
deleted file mode 100644
index 2015ecab078..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Billing agreement resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Billing_Agreement extends Mage_Sales_Model_Resource_Billing_Agreement
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php
deleted file mode 100644
index 441d53c36a5..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Billing agreements resource collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Billing_Agreement_Collection extends Mage_Sales_Model_Resource_Billing_Agreement_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php
deleted file mode 100644
index 7c63f4b1f53..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales abstract collection
- *
- * @category   Mage
- * @package    Mage_Sales
- */
-class Mage_Sales_Model_Mysql4_Collection_Abstract extends Mage_Sales_Model_Resource_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order.php
deleted file mode 100644
index 06189097803..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order extends Mage_Sales_Model_Resource_Order
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php
deleted file mode 100644
index ec77d587043..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales resource abstract
- *
- * @category   Mage
- * @package    Mage_Sales
- */
-abstract class Mage_Sales_Model_Mysql4_Order_Abstract extends Mage_Sales_Model_Resource_Order_Abstract
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php
deleted file mode 100644
index f1abba4d3be..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order address resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Address extends Mage_Sales_Model_Resource_Order_Address
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php
deleted file mode 100644
index 8ee6166a134..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order payment collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Address_Collection extends Mage_Sales_Model_Resource_Order_Address_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php
deleted file mode 100644
index 7c68f7dc501..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order billing address backend
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Billing extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php
deleted file mode 100644
index df2cc9c86f1..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Child
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php
deleted file mode 100644
index baf836175e3..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php
deleted file mode 100644
index 43fbc11b2e0..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order shipping address backend
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Shipping extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
deleted file mode 100644
index fee844f9008..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Collection extends Mage_Sales_Model_Resource_Order_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php
deleted file mode 100644
index 9a777b3c172..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order collection
- *
- * @category   Mage
- * @package    Mage_Sales
- */
-class Mage_Sales_Model_Mysql4_Order_Collection_Abstract extends Mage_Sales_Model_Resource_Order_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php
deleted file mode 100644
index e4bdd5eaa28..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order abstract comments collection, used as parent for: invoice, shipment, creditmemo
- *
- * @category   Mage
- * @package    Mage_Sales
- */
-class Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php
deleted file mode 100644
index 4874a5e64c1..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order creditmemo resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo extends Mage_Sales_Model_Resource_Order_Creditmemo
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php
deleted file mode 100644
index e534c3c6281..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php
deleted file mode 100644
index 0ccef6a604a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php
deleted file mode 100644
index ab513104648..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order creditmemo collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php
deleted file mode 100644
index e97f3e22143..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order creditmemo comment resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment extends Mage_Sales_Model_Resource_Order_Creditmemo_Comment
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php
deleted file mode 100644
index 18f6ed9794e..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order creditmemo comments collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php
deleted file mode 100644
index fd3d5d5a3b3..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order creditmemo grid collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Grid_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php
deleted file mode 100644
index e5ee63c36f0..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order creditmemo item resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Item extends Mage_Sales_Model_Resource_Order_Creditmemo_Item
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php
deleted file mode 100644
index 5a7553fc6c5..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order creditmemo items collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Creditmemo_Item_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php
deleted file mode 100644
index cbe88293b7a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order grid collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Grid_Collection extends Mage_Sales_Model_Resource_Order_Grid_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php
deleted file mode 100644
index d334f482caa..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order invoice resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice extends Mage_Sales_Model_Resource_Order_Invoice
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php
deleted file mode 100644
index fd58ad15dc8..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php
deleted file mode 100644
index 7d3ed206516..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Item extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php
deleted file mode 100644
index 586b17b9a63..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Order extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php
deleted file mode 100644
index 38b7182266a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
deleted file mode 100644
index e16bb12acf1..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order invoice collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php
deleted file mode 100644
index 626b7c70382..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order invoice comment resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Comment extends Mage_Sales_Model_Resource_Order_Invoice_Comment
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php
deleted file mode 100644
index 1a2347cf3be..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order invoice comment collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Comment_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php
deleted file mode 100644
index ba20df4b7ab..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order invoice grid collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Grid_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php
deleted file mode 100644
index 63d1622a53a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order invoice item resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Item extends Mage_Sales_Model_Resource_Order_Invoice_Item
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php
deleted file mode 100644
index 07052941acb..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order invoice item collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Invoice_Item_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php
deleted file mode 100644
index 3d657006e83..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order item resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Item extends Mage_Sales_Model_Resource_Order_Item
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php
deleted file mode 100644
index 4cdd8065b47..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order payment collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Item_Collection extends Mage_Sales_Model_Resource_Order_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php
deleted file mode 100644
index 625fe2060cb..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order payment resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Payment extends Mage_Sales_Model_Resource_Order_Payment
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php
deleted file mode 100644
index 5e53fc43f07..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order payment collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Payment_Collection extends Mage_Sales_Model_Resource_Order_Payment_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php
deleted file mode 100644
index a35c9c56ffa..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales transaction resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Payment_Transaction extends Mage_Sales_Model_Resource_Order_Payment_Transaction
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php
deleted file mode 100644
index c9d3059b09d..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Payment transactions collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Payment_Transaction_Collection extends Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php
deleted file mode 100644
index 2929ea33dac..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment extends Mage_Sales_Model_Resource_Order_Shipment
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php
deleted file mode 100644
index 75b8605c31e..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php
deleted file mode 100644
index 1d806e22247..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php
deleted file mode 100644
index 1a1802c902c..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php
deleted file mode 100644
index 4ba09b698d9..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment comment resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Comment extends Mage_Sales_Model_Resource_Order_Shipment_Comment
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php
deleted file mode 100644
index 8d13b97cbc2..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment comments collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Comment_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php
deleted file mode 100644
index aace8f2f84c..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Grid_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php
deleted file mode 100644
index 9996d611254..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment item resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Item extends Mage_Sales_Model_Resource_Order_Shipment_Item
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php
deleted file mode 100644
index 6ea99e4e3fb..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment items collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Item_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php
deleted file mode 100644
index 047d9c6a47e..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment comment resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Track extends Mage_Sales_Model_Resource_Order_Shipment_Track
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php
deleted file mode 100644
index 4f9382f72a9..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order shipment tracks collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Shipment_Track_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Track_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php
deleted file mode 100644
index 9fc5a08613d..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order status resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Status extends Mage_Sales_Model_Resource_Order_Status
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php
deleted file mode 100644
index ba42b84d8fd..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order status history collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Status_Collection extends Mage_Sales_Model_Resource_Order_Status_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php
deleted file mode 100644
index 9c2a749714a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order status history resource
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Status_History extends Mage_Sales_Model_Resource_Order_Status_History
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php
deleted file mode 100644
index c2d56fb6224..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Flat sales order status history collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Status_History_Collection extends Mage_Sales_Model_Resource_Order_Status_History_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php
deleted file mode 100644
index b86c64244a5..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Tax extends Mage_Sales_Model_Resource_Order_Tax
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php
deleted file mode 100644
index 081760c0fce..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order Tax Collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Order_Tax_Collection extends Mage_Sales_Model_Resource_Order_Tax_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php
deleted file mode 100644
index 80a13f77dfa..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote extends Mage_Sales_Model_Resource_Quote
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php
deleted file mode 100644
index 2978ceb4b94..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote address mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address extends Mage_Sales_Model_Resource_Quote_Address
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php
deleted file mode 100644
index 653e16ea0ce..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php
deleted file mode 100644
index dc556661080..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php
deleted file mode 100644
index da5136b148c..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php
deleted file mode 100644
index 937c7562b40..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Region extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php
deleted file mode 100644
index efdd01c0bf3..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php
deleted file mode 100644
index 45edb95cdd7..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Custbalance extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php
deleted file mode 100644
index e2f82536975..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Discount extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php
deleted file mode 100644
index 9b308542134..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Grand extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php
deleted file mode 100644
index 4fa92dccb85..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Shipping extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php
deleted file mode 100644
index 842df4fca3e..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Subtotal extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php
deleted file mode 100644
index d6e38e71f0f..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Tax extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php
deleted file mode 100644
index 5c5c9d3d780..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote addresses collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Collection extends Mage_Sales_Model_Resource_Quote_Address_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php
deleted file mode 100644
index bac7e61c864..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote address item mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Item extends Mage_Sales_Model_Resource_Quote_Address_Item
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php
deleted file mode 100644
index e9f61ba4473..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote addresses collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Item_Collection extends Mage_Sales_Model_Resource_Quote_Address_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php
deleted file mode 100644
index 593722f85cf..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote address shipping rate mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Rate extends Mage_Sales_Model_Resource_Quote_Address_Rate
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php
deleted file mode 100644
index 7198796af8c..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote addresses shiping rates collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Address_Rate_Collection extends Mage_Sales_Model_Resource_Quote_Address_Rate_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php
deleted file mode 100644
index 5bc4ca5f6c4..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quotes collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Collection extends Mage_Sales_Model_Resource_Quote_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php
deleted file mode 100644
index 74884605b58..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Item extends Mage_Sales_Model_Resource_Quote_Item
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php
deleted file mode 100644
index db4a64dab00..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote item resource collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Item_Collection extends Mage_Sales_Model_Resource_Quote_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php
deleted file mode 100644
index 01c16b4c8ec..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Item option mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Item_Option extends Mage_Sales_Model_Resource_Quote_Item_Option
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php
deleted file mode 100644
index 2a488d89bbd..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Item option collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Item_Option_Collection extends Mage_Sales_Model_Resource_Quote_Item_Option_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php
deleted file mode 100644
index c01e4644c00..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote payment mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Payment extends Mage_Sales_Model_Resource_Quote_Payment
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php
deleted file mode 100644
index c08829902fa..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Quote payments collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Quote_Payment_Collection extends Mage_Sales_Model_Resource_Quote_Payment_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php
deleted file mode 100644
index adb8bc57d46..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Recurring payment profiles resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Recurring_Profile extends Mage_Sales_Model_Resource_Recurring_Profile
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php
deleted file mode 100644
index dc0a022f8ac..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Recurring profile collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Recurring_Profile_Collection extends Mage_Sales_Model_Resource_Recurring_Profile_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report.php b/app/code/core/Mage/Sales/Model/Mysql4/Report.php
deleted file mode 100644
index 186305d38c2..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report extends Mage_Sales_Model_Resource_Report
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php
deleted file mode 100644
index 113c9ad3956..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order report resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- */
-abstract class Mage_Sales_Model_Mysql4_Report_Abstract extends Mage_Sales_Model_Resource_Report_Abstract
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php
deleted file mode 100644
index 1d6c148a618..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Bestsellers report resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Bestsellers extends Mage_Sales_Model_Resource_Report_Bestsellers
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php
deleted file mode 100644
index af02bb6ca3a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report bestsellers collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Bestsellers_Collection extends Mage_Sales_Model_Resource_Report_Bestsellers_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php
deleted file mode 100644
index dd638f0672a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Collection_Abstract extends Mage_Sales_Model_Resource_Report_Collection_Abstract
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php
deleted file mode 100644
index 7b5e30c71c2..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Invoiced extends Mage_Sales_Model_Resource_Report_Invoiced
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php
deleted file mode 100644
index bf90421249b..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales report invoiced collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Invoiced extends Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php
deleted file mode 100644
index 37ef0df3435..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales report invoiced collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Order extends Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php
deleted file mode 100644
index 4081f2b2931..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order entity resource model
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Order extends Mage_Sales_Model_Resource_Report_Order
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php
deleted file mode 100644
index c97a88a14a6..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report order collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Order_Collection extends Mage_Sales_Model_Resource_Report_Order_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php
deleted file mode 100644
index e7b36fd77e9..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Report order updated_at collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Order_Updatedat_Collection extends Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php
deleted file mode 100644
index b77ee91242a..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Refunded extends Mage_Sales_Model_Resource_Report_Refunded
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php
deleted file mode 100644
index d2a84fec810..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales report refunded collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Order extends Mage_Sales_Model_Resource_Report_Refunded_Collection_Order
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php
deleted file mode 100644
index ee6e7ebb675..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales report refunded collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Refunded extends Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php
deleted file mode 100644
index 5a0b2b69059..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Shipping extends Mage_Sales_Model_Resource_Report_Shipping
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php
deleted file mode 100644
index dca00107191..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales report shipping collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Order extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Order
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php
deleted file mode 100644
index 5d96fd1f585..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales report shipping collection
- *
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Shipment extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php
deleted file mode 100644
index 7bd43631398..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Sale_Collection extends Mage_Sales_Model_Resource_Sale_Collection
-{
-}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
deleted file mode 100644
index b64dc570fc3..00000000000
--- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sales
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Sales
- * @deprecated
- */
-class Mage_Sales_Model_Mysql4_Setup extends Mage_Sales_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
index a0c6d6d9607..05ecf1387cc 100644
--- a/app/code/core/Mage/Sales/etc/config.xml
+++ b/app/code/core/Mage/Sales/etc/config.xml
@@ -931,7 +931,6 @@
             </sales_entity>
             <sales_resource>
                 <class>Mage_Sales_Model_Resource</class>
-                <deprecatedNode>sales_mysql4</deprecatedNode>
                 <entities>
                     <quote>
                         <table>sales_flat_quote</table>
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php
deleted file mode 100644
index 00698f34d5a..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Coupon Resource Model
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Coupon extends Mage_SalesRule_Model_Resource_Coupon
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php
deleted file mode 100644
index df957fc0434..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Mysql4 coupon collection
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Coupon_Collection extends Mage_SalesRule_Model_Resource_Coupon_Collection
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php
deleted file mode 100644
index 86185d652b9..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Mysql4 Coupon Usage Resource Model
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Coupon_Usage extends Mage_SalesRule_Model_Resource_Coupon_Usage
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php
deleted file mode 100644
index 859679f76f2..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sales report coupons collection
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Report_Collection extends Mage_SalesRule_Model_Resource_Report_Collection
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php
deleted file mode 100644
index 2e2a2b4cf5d..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Rule report Resource Model
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Report_Rule extends Mage_SalesRule_Model_Resource_Report_Rule
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php
deleted file mode 100644
index fc1975ac30a..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Report Updatedat Collection
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Report_Updatedat_Collection extends Mage_SalesRule_Model_Resource_Report_Updatedat_Collection
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php
deleted file mode 100644
index 330bac95bc4..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule resource model
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Rule extends Mage_SalesRule_Model_Resource_Rule
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php
deleted file mode 100644
index 6c6692ac3e6..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Mysql4 Rule Collection
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Rule_Collection extends Mage_SalesRule_Model_Resource_Rule_Collection
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php
deleted file mode 100644
index 557d8d3e3cc..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Mysql4 Rule Customer Resource Model
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Rule_Customer extends Mage_SalesRule_Model_Resource_Rule_Customer
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php
deleted file mode 100644
index 27df62ada71..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Mysql4 Rule Customer Collection
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Rule_Customer_Collection extends Mage_SalesRule_Model_Resource_Rule_Customer_Collection
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php
deleted file mode 100644
index 14f632bc89b..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Mysql4 Rule Product Resource Model
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Rule_Product extends Mage_SalesRule_Model_Resource_Rule_Product
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php
deleted file mode 100644
index 93866c2f7b1..00000000000
--- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SalesRule Mysql4 Rule Product Collection
- *
- * @category   Mage
- * @package    Mage_SalesRule
- * @deprecated
- */
-class Mage_SalesRule_Model_Mysql4_Rule_Product_Collection extends Mage_SalesRule_Model_Resource_Rule_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php
index 8300c9e7cf0..dfec594d192 100644
--- a/app/code/core/Mage/SalesRule/Model/Validator.php
+++ b/app/code/core/Mage/SalesRule/Model/Validator.php
@@ -465,10 +465,10 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
             $discountAmount = $result->getDiscountAmount();
             $baseDiscountAmount = $result->getBaseDiscountAmount();
 
-            $percentKey = $item->getDiscountPercent();
             /**
              * Process "delta" rounding
              */
+            $percentKey = (string) $item->getDiscountPercent();
             if ($percentKey) {
                 $delta      = $this->_roundingDeltas[$percentKey] ?? 0;
                 $baseDelta  = $this->_baseRoundingDeltas[$percentKey] ?? 0;
diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml
index 0fdf8b999f2..53433d39b0e 100644
--- a/app/code/core/Mage/SalesRule/etc/config.xml
+++ b/app/code/core/Mage/SalesRule/etc/config.xml
@@ -33,7 +33,6 @@
             </salesrule>
             <salesrule_resource>
                 <class>Mage_SalesRule_Model_Resource</class>
-                <deprecatedNode>salesrule_mysql4</deprecatedNode>
                 <entities>
                     <rule>
                         <table>salesrule</table>
diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php
deleted file mode 100644
index 00b4bce72e9..00000000000
--- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sendfriend
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * SendFriend Log Resource Model
- *
- * @category   Mage
- * @package    Mage_Sendfriend
- * @deprecated
- */
-class Mage_Sendfriend_Model_Mysql4_Sendfriend extends Mage_Sendfriend_Model_Resource_Sendfriend
-{
-}
diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php
deleted file mode 100644
index a16a38f6235..00000000000
--- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sendfriend
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sendfriend log resource collection
- *
- * @category   Mage
- * @package    Mage_Sendfriend
- * @deprecated
- */
-class Mage_Sendfriend_Model_Mysql4_Sendfriend_Collection extends Mage_Sendfriend_Model_Resource_Sendfriend_Collection
-{
-}
diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php
deleted file mode 100644
index 6ff674de5a3..00000000000
--- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sendfriend
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sendfriend module Setup Model
- *
- * @category   Mage
- * @package    Mage_Sendfriend
- * @deprecated
- */
-class Mage_Sendfriend_Model_Mysql4_Setup extends Mage_Sendfriend_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Sendfriend/etc/config.xml b/app/code/core/Mage/Sendfriend/etc/config.xml
index 84e160884fc..c9eac3b4cef 100644
--- a/app/code/core/Mage/Sendfriend/etc/config.xml
+++ b/app/code/core/Mage/Sendfriend/etc/config.xml
@@ -28,8 +28,6 @@
             </sendfriend>
             <sendfriend_resource>
                 <class>Mage_Sendfriend_Model_Resource</class>
-                <deprecatedNode>sendfriend_mysql4</deprecatedNode>
-                <resourceModel>sendfriend_mysql4</resourceModel>
                 <entities>
                     <sendfriend>
                         <table>sendfriend_log</table>
diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php
deleted file mode 100644
index 09784293c87..00000000000
--- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Shipping
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Shipping table rates
- *
- * @category   Mage
- * @package    Mage_Shipping
- * @deprecated
- */
-class Mage_Shipping_Model_Mysql4_Carrier_Tablerate extends Mage_Shipping_Model_Resource_Carrier_Tablerate
-{
-}
diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php
deleted file mode 100644
index 5a395c4f72f..00000000000
--- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Shipping
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Shipping table rates collection
- *
- * @category   Mage
- * @package    Mage_Shipping
- * @deprecated
- */
-class Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection extends Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection
-{
-}
diff --git a/app/code/core/Mage/Shipping/etc/config.xml b/app/code/core/Mage/Shipping/etc/config.xml
index 66c9519863f..b20cd3ec2c0 100644
--- a/app/code/core/Mage/Shipping/etc/config.xml
+++ b/app/code/core/Mage/Shipping/etc/config.xml
@@ -28,7 +28,6 @@
             </shipping>
             <shipping_resource>
                 <class>Mage_Shipping_Model_Resource</class>
-                <deprecatedNode>shipping_mysql4</deprecatedNode>
                 <entities>
                     <tablerate>
                         <table>shipping_tablerate</table>
diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php
deleted file mode 100644
index 94077bfb0aa..00000000000
--- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sitemap resource catalog collection model
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @deprecated
- */
-class Mage_Sitemap_Model_Mysql4_Catalog_Category extends Mage_Sitemap_Model_Resource_Catalog_Category
-{
-}
diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php
deleted file mode 100644
index 4fa4d850dc8..00000000000
--- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sitemap resource product collection model
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @deprecated
- */
-class Mage_Sitemap_Model_Mysql4_Catalog_Product extends Mage_Sitemap_Model_Resource_Catalog_Product
-{
-}
diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php
deleted file mode 100644
index 52173383569..00000000000
--- a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sitemap cms page collection model
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @deprecated
- */
-class Mage_Sitemap_Model_Mysql4_Cms_Page extends Mage_Sitemap_Model_Resource_Cms_Page
-{
-}
diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php
deleted file mode 100644
index 748e20b6744..00000000000
--- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sitemap resource model
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @deprecated
- */
-class Mage_Sitemap_Model_Mysql4_Sitemap extends Mage_Sitemap_Model_Resource_Sitemap
-{
-}
diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php
deleted file mode 100644
index 1e2e2adbc05..00000000000
--- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Sitemap resource model collection
- *
- * @category   Mage
- * @package    Mage_Sitemap
- * @deprecated
- */
-class Mage_Sitemap_Model_Mysql4_Sitemap_Collection extends Mage_Sitemap_Model_Resource_Sitemap_Collection
-{
-}
diff --git a/app/code/core/Mage/Sitemap/etc/config.xml b/app/code/core/Mage/Sitemap/etc/config.xml
index 5c2f9b504a9..dd9d2f928db 100644
--- a/app/code/core/Mage/Sitemap/etc/config.xml
+++ b/app/code/core/Mage/Sitemap/etc/config.xml
@@ -28,7 +28,6 @@
             </sitemap>
             <sitemap_resource>
                 <class>Mage_Sitemap_Model_Resource</class>
-                <deprecatedNode>sitemap_mysql4</deprecatedNode>
                 <entities>
                     <sitemap>
                         <table>sitemap</table>
diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php
deleted file mode 100644
index 8c15c9fd251..00000000000
--- a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tag
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tags customer collection
- *
- * @category   Mage
- * @package    Mage_Tag
- * @deprecated
- */
-class Mage_Tag_Model_Mysql4_Customer_Collection extends Mage_Tag_Model_Resource_Customer_Collection
-{
-}
diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php
deleted file mode 100644
index e9955d2b9c5..00000000000
--- a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tag
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tag Indexer Model
- *
- * @category   Mage
- * @package    Mage_Tag
- * @deprecated
- */
-class Mage_Tag_Model_Mysql4_Indexer_Summary extends Mage_Tag_Model_Resource_Indexer_Summary
-{
-}
diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php
deleted file mode 100644
index f5c9db27102..00000000000
--- a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tag
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Popular tags collection model
- *
- * @category   Mage
- * @package    Mage_Tag
- *
- */
-class Mage_Tag_Model_Mysql4_Popular_Collection extends Mage_Tag_Model_Resource_Popular_Collection
-{
-}
diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php
deleted file mode 100644
index 1aa5cfe7776..00000000000
--- a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tag
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tagged Product(s) Collection
- *
- * @category   Mage
- * @package    Mage_Tag
- * @deprecated
- */
-class Mage_Tag_Model_Mysql4_Product_Collection extends Mage_Tag_Model_Resource_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php
deleted file mode 100644
index bd8e8be510b..00000000000
--- a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tag
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tag resource model
- *
- * @category   Mage
- * @package    Mage_Tag
- * @deprecated
- */
-class Mage_Tag_Model_Mysql4_Tag extends Mage_Tag_Model_Resource_Tag
-{
-}
diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php
deleted file mode 100644
index 7c006938848..00000000000
--- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tag
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tag collection model
- *
- * @category   Mage
- * @package    Mage_Tag
- * @deprecated
- */
-class Mage_Tag_Model_Mysql4_Tag_Collection extends Mage_Tag_Model_Resource_Tag_Collection
-{
-}
diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php
deleted file mode 100644
index 6ce4cd6496f..00000000000
--- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tag
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tag Relation resource model
- *
- * @category   Mage
- * @package    Mage_Tag
- * @deprecated
- */
-class Mage_Tag_Model_Mysql4_Tag_Relation extends Mage_Tag_Model_Resource_Tag_Relation
-{
-}
diff --git a/app/code/core/Mage/Tag/etc/config.xml b/app/code/core/Mage/Tag/etc/config.xml
index e2914005719..7c4caa3d1d3 100644
--- a/app/code/core/Mage/Tag/etc/config.xml
+++ b/app/code/core/Mage/Tag/etc/config.xml
@@ -28,12 +28,10 @@
             </tag>
             <tag_customer>
                 <class>Mage_Tag_Model_Customer</class>
-                <!-- <resourceModel>tag_customer_mysql4</resourceModel> -->
                 <resourceModel>tag_customer_resource</resourceModel>
             </tag_customer>
             <tag_resource>
                 <class>Mage_Tag_Model_Resource</class>
-                <deprecatedNode>tag_mysql4</deprecatedNode>
                 <entities>
                     <tag>
                         <table>tag</table>
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php
deleted file mode 100644
index 019616152ea..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax Calculation Resource Model
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation extends Mage_Tax_Model_Resource_Calculation
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php
deleted file mode 100644
index b61196cd6e4..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax Calculation Collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation_Collection extends Mage_Tax_Model_Resource_Calculation_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php
deleted file mode 100644
index ede84f63ecc..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax rate resource model
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation_Rate extends Mage_Tax_Model_Resource_Calculation_Rate
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php
deleted file mode 100644
index 38bce0e2811..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax rate collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation_Rate_Collection extends Mage_Tax_Model_Resource_Calculation_Rate_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php
deleted file mode 100644
index 4499bb67946..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax Rate Title Collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation_Rate_Title extends Mage_Tax_Model_Resource_Calculation_Rate_Title
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php
deleted file mode 100644
index 2b892616647..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax Rate Title Collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation_Rate_Title_Collection extends Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php
deleted file mode 100644
index 38ab5d53417..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax rate resource model
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation_Rule extends Mage_Tax_Model_Resource_Calculation_Rule
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php
deleted file mode 100644
index bb82d1655c6..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax rule collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Calculation_Rule_Collection extends Mage_Tax_Model_Resource_Calculation_Rule_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class.php b/app/code/core/Mage/Tax/Model/Mysql4/Class.php
deleted file mode 100644
index e7a2dd6aaf3..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax class resource
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Class extends Mage_Tax_Model_Resource_Class
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php
deleted file mode 100644
index ead1bfef6ce..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax class collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Class_Collection extends Mage_Tax_Model_Resource_Class_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php
deleted file mode 100644
index 177282e37ee..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax report collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Report_Collection extends Mage_Tax_Model_Resource_Report_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php
deleted file mode 100644
index 0b2d8f969cb..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Report_Tax extends Mage_Tax_Model_Resource_Report_Tax
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php
deleted file mode 100644
index 3b7f1edda2f..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax report collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Report_Updatedat_Collection extends Mage_Tax_Model_Resource_Report_Updatedat_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php
deleted file mode 100644
index 6a54376c70c..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Sales_Order_Tax extends Mage_Tax_Model_Resource_Sales_Order_Tax
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php
deleted file mode 100644
index 70185d2410c..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Order Tax Collection
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Sales_Order_Tax_Collection extends Mage_Tax_Model_Resource_Sales_Order_Tax_Collection
-{
-}
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php
deleted file mode 100644
index 0657638327b..00000000000
--- a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Tax
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Tax Setup Resource Model
- *
- * @category   Mage
- * @package    Mage_Tax
- * @deprecated
- */
-class Mage_Tax_Model_Mysql4_Setup extends Mage_Tax_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml
index 736c5e49f80..091c1051c20 100644
--- a/app/code/core/Mage/Tax/etc/config.xml
+++ b/app/code/core/Mage/Tax/etc/config.xml
@@ -28,7 +28,6 @@
             </tax>
             <tax_resource>
                 <class>Mage_Tax_Model_Resource</class>
-                <deprecatedNode>tax_mysql4</deprecatedNode>
                 <entities>
                     <tax_class>
                         <table>tax_class</table>
diff --git a/app/code/core/Mage/Uploader/Helper/File.php b/app/code/core/Mage/Uploader/Helper/File.php
index 236adfbedb6..cd4dc9090f6 100644
--- a/app/code/core/Mage/Uploader/Helper/File.php
+++ b/app/code/core/Mage/Uploader/Helper/File.php
@@ -235,6 +235,7 @@ class Mage_Uploader_Helper_File extends Mage_Core_Helper_Abstract
             'xjisp' => 'application/vnd.jisp',
             'xjlt' => 'application/vnd.hp-jlyt',
             'xjoda' => 'application/vnd.joost.joda-archive',
+            'xwebp' => 'image/webp',
             'xjpe' => 'image/jpeg',
             'xjpeg' => 'image/jpeg',
             'xjpg' => 'image/jpeg',
diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php
deleted file mode 100644
index 61f59e1ea74..00000000000
--- a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Weee
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Catalog product WEEE tax backend attribute model
- *
- * @category   Mage
- * @package    Mage_Weee
- * @deprecated
- */
-class Mage_Weee_Model_Mysql4_Attribute_Backend_Weee_Tax extends Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax
-{
-}
diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php
deleted file mode 100644
index 5aa3275b842..00000000000
--- a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Weee
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Weee tax setup
- *
- * @category   Mage
- * @package    Mage_Weee
- * @deprecated
- */
-class Mage_Weee_Model_Mysql4_Setup extends Mage_Weee_Model_Resource_Setup
-{
-}
diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php
deleted file mode 100644
index 04a90451bf1..00000000000
--- a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Weee
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * @category   Mage
- * @package    Mage_Weee
- * @deprecated
- */
-class Mage_Weee_Model_Mysql4_Tax extends Mage_Weee_Model_Resource_Tax
-{
-}
diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml
index 85caa4b4a96..52baeb42e38 100644
--- a/app/code/core/Mage/Weee/etc/config.xml
+++ b/app/code/core/Mage/Weee/etc/config.xml
@@ -28,7 +28,6 @@
             </weee>
             <weee_resource>
                 <class>Mage_Weee_Model_Resource</class>
-                <deprecatedNode>weee_mysql4</deprecatedNode>
                 <entities>
                     <tax>
                         <table>weee_tax</table>
diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php
deleted file mode 100644
index e6ff908b2e1..00000000000
--- a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Widget
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Preconfigured widget
- *
- * @category   Mage
- * @package    Mage_Widget
- * @deprecated
- */
-class Mage_Widget_Model_Mysql4_Widget extends Mage_Widget_Model_Resource_Widget
-{
-}
diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php
deleted file mode 100644
index 855607449fb..00000000000
--- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Widget
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Widget Instance Resource Model
- *
- * @category   Mage
- * @package    Mage_Widget
- * @deprecated
- */
-class Mage_Widget_Model_Mysql4_Widget_Instance extends Mage_Widget_Model_Resource_Widget_Instance
-{
-}
diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php
deleted file mode 100644
index 8af859ff717..00000000000
--- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Widget
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Widget Instance Collection
- *
- * @category   Mage
- * @package    Mage_Widget
- * @deprecated
- */
-class Mage_Widget_Model_Mysql4_Widget_Instance_Collection extends Mage_Widget_Model_Resource_Widget_Instance_Collection
-{
-}
diff --git a/app/code/core/Mage/Widget/etc/config.xml b/app/code/core/Mage/Widget/etc/config.xml
index 6b8dea1c924..3b0236a3e68 100644
--- a/app/code/core/Mage/Widget/etc/config.xml
+++ b/app/code/core/Mage/Widget/etc/config.xml
@@ -28,7 +28,6 @@
             </widget>
             <widget_resource>
                 <class>Mage_Widget_Model_Resource</class>
-                <deprecatedNode>widget_mysql4</deprecatedNode>
                 <entities>
                     <widget>
                         <table>widget</table>
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php
deleted file mode 100644
index 72e3bacc39e..00000000000
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Wishlist item model resource
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @deprecated
- */
-class Mage_Wishlist_Model_Mysql4_Item extends Mage_Wishlist_Model_Resource_Item
-{
-}
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
deleted file mode 100644
index 835dfc53eb7..00000000000
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Wishlist item collection
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @deprecated
- */
-class Mage_Wishlist_Model_Mysql4_Item_Collection extends Mage_Wishlist_Model_Resource_Item_Collection
-{
-}
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php
deleted file mode 100644
index 303274cc418..00000000000
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Item option mysql4 resource model
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @deprecated
- */
-class Mage_Wishlist_Model_Mysql4_Item_Option extends Mage_Wishlist_Model_Resource_Item_Option
-{
-}
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php
deleted file mode 100644
index 0a7e3b66a5a..00000000000
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Item option collection
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @deprecated
- */
-class Mage_Wishlist_Model_Mysql4_Item_Option_Collection extends Mage_Wishlist_Model_Resource_Item_Option_Collection
-{
-}
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php
deleted file mode 100644
index 139fe8b4df0..00000000000
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Wishlist Product collection
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @deprecated
- */
-class Mage_Wishlist_Model_Mysql4_Product_Collection extends Mage_Wishlist_Model_Resource_Product_Collection
-{
-}
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php
deleted file mode 100644
index 47b78c0b97a..00000000000
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Wishlist model resource
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @deprecated
- */
-class Mage_Wishlist_Model_Mysql4_Wishlist extends Mage_Wishlist_Model_Resource_Wishlist
-{
-}
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php
deleted file mode 100644
index 9790e0c5ccc..00000000000
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Wislist model collection
- *
- * @category   Mage
- * @package    Mage_Wishlist
- * @deprecated
- */
-class Mage_Wishlist_Model_Mysql4_Wishlist_Collection extends Mage_Wishlist_Model_Resource_Wishlist_Collection
-{
-}
diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml
index 33b71d823f1..87558e4c3e3 100644
--- a/app/code/core/Mage/Wishlist/etc/config.xml
+++ b/app/code/core/Mage/Wishlist/etc/config.xml
@@ -33,7 +33,6 @@
             </wishlist>
             <wishlist_resource>
                 <class>Mage_Wishlist_Model_Resource</class>
-                <deprecatedNode>wishlist_mysql4</deprecatedNode>
                 <entities>
                     <wishlist>
                         <table>wishlist</table>
diff --git a/app/etc/config.xml b/app/etc/config.xml
index 7e97dbc704a..d2a3107fd05 100644
--- a/app/etc/config.xml
+++ b/app/etc/config.xml
@@ -83,7 +83,6 @@
             </core>
             <core_resource>
                 <class>Mage_Core_Model_Resource</class>
-                <deprecatedNode>core_mysql4</deprecatedNode>
                 <entities>
                     <config_data>
                         <table>core_config_data</table>
diff --git a/composer.lock b/composer.lock
index e9ff8918641..f70e897a351 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2664,16 +2664,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.21.0",
+            "version": "v3.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "f29a0598c022baf99d2136da533820fec63167ed"
+                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f29a0598c022baf99d2136da533820fec63167ed",
-                "reference": "f29a0598c022baf99d2136da533820fec63167ed",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3",
+                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3",
                 "shasum": ""
             },
             "require": {
@@ -2697,6 +2697,7 @@
                 "symfony/stopwatch": "^5.4 || ^6.0"
             },
             "require-dev": {
+                "facile-it/paraunit": "^1.3 || ^2.0",
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^2.0",
                 "mikey179/vfsstream": "^1.6.11",
@@ -2748,7 +2749,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.21.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.22.0"
             },
             "funding": [
                 {
@@ -2756,7 +2757,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-05T21:28:10+00:00"
+            "time": "2023-07-16T23:08:06+00:00"
         },
         {
             "name": "macopedia/phpstan-magento1",
@@ -2895,16 +2896,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.5",
+            "version": "v4.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
                 "shasum": ""
             },
             "require": {
@@ -2945,9 +2946,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
             },
-            "time": "2023-05-19T20:20:00+00:00"
+            "time": "2023-06-25T14:52:30+00:00"
         },
         {
             "name": "openmage/dev-copyright",
@@ -3752,16 +3753,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.9",
+            "version": "9.6.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
+                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
-                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328",
+                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328",
                 "shasum": ""
             },
             "require": {
@@ -3835,7 +3836,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10"
             },
             "funding": [
                 {
@@ -3851,7 +3852,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-11T06:13:56+00:00"
+            "time": "2023-07-10T04:04:23+00:00"
         },
         {
             "name": "psr/cache",
diff --git a/lib/Varien/File/Transfer/Adapter/Http.php b/lib/Varien/File/Transfer/Adapter/Http.php
index 202ec37f101..f7d424c46f0 100644
--- a/lib/Varien/File/Transfer/Adapter/Http.php
+++ b/lib/Varien/File/Transfer/Adapter/Http.php
@@ -32,6 +32,7 @@ class Varien_File_Transfer_Adapter_Http
         'flv' => 'video/x-flv',
 
         // images
+        'webp' => 'image/webp',
         'png' => 'image/png',
         'jpe' => 'image/jpeg',
         'jpeg' => 'image/jpeg',
diff --git a/lib/Varien/Image/Adapter/Gd2.php b/lib/Varien/Image/Adapter/Gd2.php
index 86315faccef..2776380bc56 100644
--- a/lib/Varien/Image/Adapter/Gd2.php
+++ b/lib/Varien/Image/Adapter/Gd2.php
@@ -17,6 +17,7 @@ class Varien_Image_Adapter_Gd2 extends Varien_Image_Adapter_Abstract
 {
     protected $_requiredExtensions = ["gd"];
     private static $_callbacks = [
+        IMAGETYPE_WEBP => ['output' => 'imagewebp', 'create' => 'imagecreatefromwebp'],
         IMAGETYPE_GIF  => ['output' => 'imagegif',  'create' => 'imagecreatefromgif'],
         IMAGETYPE_JPEG => ['output' => 'imagejpeg', 'create' => 'imagecreatefromjpeg'],
         IMAGETYPE_PNG  => ['output' => 'imagepng',  'create' => 'imagecreatefrompng'],
@@ -150,6 +151,11 @@ public function save($destination = null, $newName = null)
             }
         }
 
+        // convert palette based image to true color
+        if ($this->_fileType == IMAGETYPE_WEBP) {
+            imagepalettetotruecolor($this->_imageHandler);
+        }
+
         if (!$this->_resized) {
             // keep alpha transparency
             $isAlpha     = false;
diff --git a/lib/Varien/Io/File.php b/lib/Varien/Io/File.php
index 47ca72c8570..d583d7287e8 100644
--- a/lib/Varien/Io/File.php
+++ b/lib/Varien/Io/File.php
@@ -91,6 +91,11 @@ class Varien_Io_File extends Varien_Io_Abstract
      */
     protected $_streamException;
 
+    /**
+     * @var string[]
+     */
+    public const ALLOWED_IMAGES_EXTENSIONS = ['webp', 'jpg', 'jpeg', 'png', 'gif', 'bmp'];
+
     public function __construct()
     {
         // Initialize shutdown function
@@ -819,7 +824,7 @@ public function ls($grep = null)
                     $list_item['size'] = filesize($fullpath);
                     $list_item['leaf'] = true;
                     if (isset($pathinfo['extension'])
-                        && in_array(strtolower($pathinfo['extension']), ['jpg', 'jpeg', 'gif', 'bmp', 'png'])
+                        && in_array(strtolower($pathinfo['extension']), self::ALLOWED_IMAGES_EXTENSIONS)
                         && $list_item['size'] > 0
                     ) {
                         $list_item['is_image'] = true;
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
index 9d9ec9e001b..f5619add4fa 100644
--- a/phpstan.dist.baseline.neon
+++ b/phpstan.dist.baseline.neon
@@ -115,6 +115,36 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
 
+		-
+			message: "#^Variable \\$d might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+
+		-
+			message: "#^Variable \\$localmaxlength might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+
+		-
+			message: "#^Variable \\$localmaxvalue might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+
+		-
+			message: "#^Variable \\$localminvalue might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+
+		-
+			message: "#^Variable \\$class might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php
+
+		-
+			message: "#^Variable \\$value might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php
+
 		-
 			message: "#^Access to an undefined property Mage_Adminhtml_Block_Notification_Window\\:\\:\\$_aclResourcePath\\.$#"
 			count: 1
@@ -260,6 +290,21 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
 
+		-
+			message: "#^Variable \\$createLabelUrl might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
+
+		-
+			message: "#^Variable \\$itemsGridUrl might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
+
+		-
+			message: "#^Variable \\$itemsOrderItemId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
+
 		-
 			message: "#^Return type \\(Mage_Sales_Model_Order_Shipment\\) of method Mage_Adminhtml_Block_Sales_Order_Shipment_View_Items\\:\\:getSource\\(\\) should be compatible with return type \\(Mage_Sales_Model_Order_Invoice\\) of method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getSource\\(\\)$#"
 			count: 1
@@ -305,11 +350,81 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
 
+		-
+			message: "#^Variable \\$attributes might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
+
+		-
+			message: "#^Variable \\$img might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php
+
+		-
+			message: "#^Variable \\$liStyle might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php
+
 		-
 			message: "#^Method Mage_Core_Model_Email_Template\\:\\:getProcessedTemplate\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#"
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php
 
+		-
+			message: "#^Variable \\$addLabel might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+
+		-
+			message: "#^Variable \\$deleteLabel might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+
+		-
+			message: "#^Variable \\$deleteUrl might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+
+		-
+			message: "#^Variable \\$editLabel might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+
+		-
+			message: "#^Variable \\$saveLabel might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+
+		-
+			message: "#^Variable \\$groupModel might not be defined\\.$#"
+			count: 18
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
+
+		-
+			message: "#^Variable \\$showGroupFieldset might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
+
+		-
+			message: "#^Variable \\$showStoreFieldset might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
+
+		-
+			message: "#^Variable \\$showWebsiteFieldset might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
+
+		-
+			message: "#^Variable \\$storeModel might not be defined\\.$#"
+			count: 21
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
+
+		-
+			message: "#^Variable \\$websiteModel might not be defined\\.$#"
+			count: 15
+			path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
+
 		-
 			message: "#^Call to an undefined method Mage_Tag_Model_Resource_Tag_Collection\\:\\:addAttributeToFilter\\(\\)\\.$#"
 			count: 1
@@ -400,6 +515,16 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
 
+		-
+			message: "#^Variable \\$billingAddress might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+
+		-
+			message: "#^Variable \\$shippingAddress might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+
 		-
 			message: "#^Call to an undefined method Mage_Sales_Model_Order\\:\\:createFromQuoteAddress\\(\\)\\.$#"
 			count: 1
@@ -430,6 +555,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Model/System/Store.php
 
+		-
+			message: "#^Variable \\$values might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/Model/System/Store.php
+
 		-
 			message: "#^Return type \\(Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute\\) of method Mage_Adminhtml_Catalog_Product_Action_AttributeController\\:\\:_getHelper\\(\\) should be compatible with return type \\(Mage_Adminhtml_Helper_Data\\) of method Mage_Adminhtml_Controller_Action\\:\\:_getHelper\\(\\)$#"
 			count: 1
@@ -530,6 +660,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
 
+		-
+			message: "#^Variable \\$pdf might not be defined\\.$#"
+			count: 4
+			path: app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
+
 		-
 			message: "#^Variable \\$data in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
@@ -545,6 +680,31 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
 
+		-
+			message: "#^Variable \\$codeBase might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+
+		-
+			message: "#^Variable \\$itemId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+
+		-
+			message: "#^Variable \\$model might not be defined\\.$#"
+			count: 5
+			path: app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+
+		-
+			message: "#^Variable \\$notExists might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+
+		-
+			message: "#^Variable \\$title might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+
 		-
 			message: "#^Method Mage_Directory_Model_Country\\:\\:loadByCode\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 1
@@ -680,11 +840,21 @@ parameters:
 			count: 4
 			path: app/code/core/Mage/Api2/Helper/Data.php
 
+		-
+			message: "#^Variable \\$adapters might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Api2/Helper/Data.php
+
 		-
 			message: "#^Parameter \\#1 \\$roleId \\(int\\) of method Mage_Api2_Model_Acl\\:\\:addRole\\(\\) should be compatible with parameter \\$role \\(string\\|Zend_Acl_Role_Interface\\) of method Zend_Acl\\:\\:addRole\\(\\)$#"
 			count: 1
 			path: app/code/core/Mage/Api2/Model/Acl.php
 
+		-
+			message: "#^Variable \\$operationName might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
+
 		-
 			message: "#^Method Mage_Api2_Model_Config\\:\\:getResourceGroup\\(\\) should return bool\\|Mage_Core_Model_Config_Element but returns Varien_Simplexml_Element\\.$#"
 			count: 1
@@ -825,6 +995,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php
 
+		-
+			message: "#^Variable \\$params might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php
+
 		-
 			message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#"
 			count: 1
@@ -870,6 +1045,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
 
+		-
+			message: "#^Variable \\$_items might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+
 		-
 			message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Price\\:\\:getIsPricesCalculatedByIndex\\(\\)\\.$#"
 			count: 1
@@ -880,6 +1060,11 @@ parameters:
 			count: 3
 			path: app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
 
+		-
+			message: "#^Variable \\$_items might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php
+
 		-
 			message: "#^Call to an undefined method Mage_Catalog_Model_Product_Configuration_Item_Interface\\:\\:getQty\\(\\)\\.$#"
 			count: 1
@@ -955,6 +1140,21 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Bundle/Model/Product/Type.php
 
+		-
+			message: "#^Variable \\$basePrice might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
+
+		-
+			message: "#^Variable \\$customOptions might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
+
+		-
+			message: "#^Variable \\$_items might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php
+
 		-
 			message: "#^Call to an undefined method Mage_Captcha_Model_Interface\\:\\:isRequired\\(\\)\\.$#"
 			count: 1
@@ -1025,6 +1225,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Block/Product.php
 
+		-
+			message: "#^Variable \\$productId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Block/Product.php
+
 		-
 			message: "#^Property Mage_Catalog_Block_Product_Abstract\\:\\:\\$_reviewsHelperBlock \\(Mage_Review_Block_Helper\\|null\\) does not accept Mage_Core_Block_Abstract\\|false\\.$#"
 			count: 1
@@ -1040,11 +1245,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Block/Product/List.php
 
-		-
-			message: "#^Property Mage_Catalog_Block_Product_List_Crosssell\\:\\:\\$_itemCollection \\(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection\\) does not accept Mage_Catalog_Model_Resource_Product_Link_Product_Collection\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php
-
 		-
 			message: "#^Method Mage_Catalog_Block_Product_List_Toolbar\\:\\:getDefaultPerPageValue\\(\\) should return string but returns int\\.$#"
 			count: 1
@@ -1095,6 +1295,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php
 
+		-
+			message: "#^Variable \\$finish might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php
+
+		-
+			message: "#^Variable \\$start might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php
+
 		-
 			message: "#^Property Mage_Catalog_Block_Product_Widget_New\\:\\:\\$_pager \\(Mage_Catalog_Block_Product_Widget_Html_Pager\\) does not accept Mage_Core_Block_Abstract\\|false\\.$#"
 			count: 1
@@ -1110,6 +1320,21 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php
 
+		-
+			message: "#^Variable \\$finish might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
+
+		-
+			message: "#^Variable \\$start might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
+
+		-
+			message: "#^Variable \\$store might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Block/Widget/Link.php
+
 		-
 			message: "#^Property Mage_Catalog_Helper_Data\\:\\:\\$_categoryPath \\(string\\) does not accept array\\<string, array\\<string, string\\>\\>\\.$#"
 			count: 1
@@ -1135,16 +1360,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Helper/Product.php
 
-		-
-			message: "#^Method Mage_Catalog_Helper_Product_Compare\\:\\:getItemCollection\\(\\) should return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection but returns Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Helper/Product/Compare.php
-
-		-
-			message: "#^Property Mage_Catalog_Helper_Product_Compare\\:\\:\\$_itemCollection \\(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection\\) does not accept Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Helper/Product/Compare.php
-
 		-
 			message: "#^Call to an undefined method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:setStoreId\\(\\)\\.$#"
 			count: 1
@@ -1290,6 +1505,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Design.php
 
+		-
+			message: "#^Variable \\$_category might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Design.php
+
 		-
 			message: "#^Property Mage_Catalog_Model_Entity_Product_Attribute_Design_Options_Container\\:\\:\\$_configNodePath \\(Mage_Core_Model_Config_Element\\) does not accept string\\.$#"
 			count: 1
@@ -1350,16 +1570,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Product.php
 
-		-
-			message: "#^Property Mage_Catalog_Model_Product\\:\\:\\$_stockItem \\(Mage_CatalogInventory_Model_Stock_Item\\) does not accept Varien_Object\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Product.php
-
-		-
-			message: "#^Property Mage_Catalog_Model_Product\\:\\:\\$_typeInstance \\(Mage_Catalog_Model_Product_Type_Abstract\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Product.php
-
 		-
 			message: "#^Parameter \\#3 \\$attributes \\(stdClass\\) of method Mage_Catalog_Model_Product_Api_V2\\:\\:info\\(\\) should be compatible with parameter \\$attributes \\(array\\) of method Mage_Catalog_Model_Product_Api\\:\\:info\\(\\)$#"
 			count: 1
@@ -1400,11 +1610,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php
 
-		-
-			message: "#^Method Mage_Catalog_Model_Product_Option\\:\\:getValuesCollection\\(\\) should return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection but returns Mage_Catalog_Model_Resource_Product_Option_Value_Collection\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Product/Option.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Product_Option\\:\\:groupFactory\\(\\) should return Mage_Catalog_Model_Product_Option_Type_Default but returns Mage_Core_Model_Abstract\\|false\\.$#"
 			count: 1
@@ -1515,21 +1720,51 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Category.php
 
+		-
+			message: "#^Variable \\$condition might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php
+
 		-
 			message: "#^Call to an undefined method Mage_Catalog_Model_Resource_Category_Collection\\:\\:addSortedField\\(\\)\\.$#"
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
 
+		-
+			message: "#^Variable \\$options might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
+
 		-
 			message: "#^Call to an undefined method Mage_Core_Model_Resource_Db_Abstract\\:\\:getMainStoreTable\\(\\)\\.$#"
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
 
+		-
+			message: "#^Variable \\$condition might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
+
 		-
 			message: "#^Call to an undefined method Zend_Db_Select\\:\\:insertFromSelect\\(\\)\\.$#"
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php
 
+		-
+			message: "#^Variable \\$anchorProductsTable might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php
+
+		-
+			message: "#^Variable \\$anchorTable might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php
+
+		-
+			message: "#^Variable \\$enabledTable might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php
+
 		-
 			message: "#^Call to an undefined method Zend_Db_Adapter_Abstract\\:\\:getCheckSql\\(\\)\\.$#"
 			count: 2
@@ -1630,6 +1865,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
 
+		-
+			message: "#^Variable \\$websiteId might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
+
 		-
 			message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item\\:\\:getCount\\(\\) should return int but returns string\\|false\\|null\\.$#"
 			count: 1
@@ -1660,6 +1900,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php
 
+		-
+			message: "#^Variable \\$category might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Url.php
+
 		-
 			message: "#^Loose comparison using \\=\\= between true and true will always evaluate to true\\.$#"
 			count: 2
@@ -1675,6 +1920,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogIndex/Model/Attribute.php
 
+		-
+			message: "#^Variable \\$idField might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
+
+		-
+			message: "#^Variable \\$whereField might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
+
 		-
 			message: "#^Parameter \\#1 \\$product \\(array\\) of method Mage_CatalogIndex_Model_Data_Grouped\\:\\:getFinalPrice\\(\\) should be compatible with parameter \\$product \\(int\\) of method Mage_CatalogIndex_Model_Data_Abstract\\:\\:getFinalPrice\\(\\)$#"
 			count: 1
@@ -1700,6 +1955,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogIndex/Model/Indexer.php
 
+		-
+			message: "#^Variable \\$storeObject might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/CatalogIndex/Model/Indexer.php
+
 		-
 			message: "#^Return type \\(string\\) of method Mage_CatalogIndex_Model_Indexer_Eav\\:\\:_getIndexableAttributeConditions\\(\\) should be compatible with return type \\(array\\) of method Mage_CatalogIndex_Model_Indexer_Abstract\\:\\:_getIndexableAttributeConditions\\(\\)$#"
 			count: 1
@@ -1760,6 +2020,26 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php
 
+		-
+			message: "#^Variable \\$gId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogRule/Model/Observer.php
+
+		-
+			message: "#^Variable \\$pId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogRule/Model/Observer.php
+
+		-
+			message: "#^Variable \\$wId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogRule/Model/Observer.php
+
+		-
+			message: "#^Variable \\$indexAlias might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php
+
 		-
 			message: "#^Call to an undefined method Mage_Rule_Model_Condition_Combine\\:\\:collectValidatedAttributes\\(\\)\\.$#"
 			count: 1
@@ -1770,6 +2050,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
 
+		-
+			message: "#^Variable \\$temp might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogSearch/Block/Term.php
+
+		-
+			message: "#^Variable \\$termKeys might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/CatalogSearch/Block/Term.php
+
 		-
 			message: "#^Property Mage_CatalogSearch_Helper_Data\\:\\:\\$_queryText \\(string\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
@@ -1780,6 +2070,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogSearch/Model/Advanced.php
 
+		-
+			message: "#^Variable \\$select might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php
+
 		-
 			message: "#^If condition is always true\\.$#"
 			count: 1
@@ -1840,6 +2135,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php
 
+		-
+			message: "#^Variable \\$customer might not be defined\\.$#"
+			count: 4
+			path: app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
+
 		-
 			message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Checkout_Model_Cart_Customer_Api_V2\\:\\:_prepareCustomerAddressData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Checkout_Model_Cart_Customer_Api\\:\\:_prepareCustomerAddressData\\(\\)$#"
 			count: 1
@@ -1925,6 +2225,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
 
+		-
+			message: "#^Variable \\$query might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php
+
 		-
 			message: "#^Method Mage_Core_Block_Abstract\\:\\:_getUrlModel\\(\\) should return Mage_Core_Model_Url but returns Mage_Core_Model_Abstract\\|false\\.$#"
 			count: 1
@@ -2000,6 +2305,26 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
 
+		-
+			message: "#^Variable \\$action might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+
+		-
+			message: "#^Variable \\$controller might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+
+		-
+			message: "#^Variable \\$controllerInstance might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+
+		-
+			message: "#^Variable \\$realModule might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+
 		-
 			message: "#^Method Mage_Core_Helper_Abstract\\:\\:_getRequest\\(\\) should return Mage_Core_Controller_Request_Http but returns Zend_Controller_Request_Http\\.$#"
 			count: 1
@@ -2090,6 +2415,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Config.php
 
+		-
+			message: "#^Variable \\$key might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Core/Model/Config.php
+
 		-
 			message: "#^Method Mage_Core_Model_Cookie\\:\\:getHttponly\\(\\) should return bool but returns null\\.$#"
 			count: 1
@@ -2165,6 +2495,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/File/Storage.php
 
+		-
+			message: "#^Variable \\$parentId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php
+
 		-
 			message: "#^PHPDoc tag @param for parameter \\$filter with type array\\|Zend_Filter_Interface is not subtype of native type Zend_Filter_Interface\\.$#"
 			count: 1
@@ -2255,6 +2590,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
 
+		-
+			message: "#^Variable \\$alias might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
+
 		-
 			message: "#^Variable \\$columnsToSelect in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
@@ -2365,6 +2705,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Url/Rewrite.php
 
+		-
+			message: "#^Variable \\$targetUrl might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Core/Model/Url/Rewrite.php
+
 		-
 			message: "#^Negated boolean expression is always true\\.$#"
 			count: 1
@@ -2385,6 +2730,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/functions.php
 
+		-
+			message: "#^Variable \\$arguments might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Cron/Model/Observer.php
+
 		-
 			message: "#^Property Mage_CurrencySymbol_Model_System_Currencysymbol\\:\\:\\$_storeId \\(string\\|null\\) does not accept int\\|null\\.$#"
 			count: 1
@@ -2475,6 +2825,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
 
+		-
+			message: "#^Variable \\$regionId might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
+
 		-
 			message: "#^Method Mage_Directory_Model_Region\\:\\:loadByName\\(\\) invoked with 1 parameter, 2 required\\.$#"
 			count: 1
@@ -2615,6 +2970,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Dataflow/Model/Profile.php
 
+		-
+			message: "#^Variable \\$parseFileXml might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Dataflow/Model/Profile.php
+
+		-
+			message: "#^Variable \\$path might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Dataflow/Model/Profile.php
+
 		-
 			message: "#^Method Mage_Directory_Helper_Data\\:\\:getCountryCollection\\(\\) should return Mage_Directory_Model_Resource_Country_Collection but returns Mage_Core_Model_Resource_Db_Collection_Abstract\\.$#"
 			count: 1
@@ -2630,11 +2995,21 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Directory/Model/Country.php
 
+		-
+			message: "#^Variable \\$response might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php
+
 		-
 			message: "#^Method Mage_Directory_Model_Currency_Import_Webservicex\\:\\:_convert\\(\\) should return float\\|null but return statement is missing\\.$#"
 			count: 1
 			path: app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php
 
+		-
+			message: "#^Variable \\$importModel might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Directory/Model/Observer.php
+
 		-
 			message: "#^Left side of && is always true\\.$#"
 			count: 1
@@ -2650,6 +3025,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Downloadable/Helper/Download.php
 
+		-
+			message: "#^Variable \\$downloadableModel might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Downloadable/Model/Link/Api.php
+
 		-
 			message: "#^Parameter \\#2 \\$resource \\(object\\) of method Mage_Downloadable_Model_Link_Api_V2\\:\\:add\\(\\) should be compatible with parameter \\$resource \\(array\\) of method Mage_Downloadable_Model_Link_Api\\:\\:add\\(\\)$#"
 			count: 1
@@ -2715,6 +3095,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
 
+		-
+			message: "#^Variable \\$defBind might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
+
+		-
+			message: "#^Variable \\$entityIds might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
+
 		-
 			message: "#^Binary operation \"\\.\" between Mage_Eav_Model_Entity_Interface and '_collection' results in an error\\.$#"
 			count: 1
@@ -2730,6 +3120,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
 
+		-
+			message: "#^Variable \\$collection might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
+
+		-
+			message: "#^Variable \\$entity might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
+
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Abstract\\:\\:_getReadAdapter\\(\\) should return Magento_Db_Adapter_Pdo_Mysql but returns Varien_Db_Adapter_Interface\\|false\\.$#"
 			count: 1
@@ -2741,28 +3141,53 @@ parameters:
 			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
 
 		-
-			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#"
+			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
+
+		-
+			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
+
+		-
+			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_type \\(Mage_Eav_Model_Entity_Type\\) in empty\\(\\) is not falsy\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
+
+		-
+			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
+
+		-
+			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
+
+		-
+			message: "#^Variable \\$attributeCode might not be defined\\.$#"
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
 
 		-
-			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#"
+			message: "#^Variable \\$id might not be defined\\.$#"
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
 
 		-
-			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_type \\(Mage_Eav_Model_Entity_Type\\) in empty\\(\\) is not falsy\\.$#"
-			count: 1
+			message: "#^Variable \\$instance might not be defined\\.$#"
+			count: 2
 			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
 
 		-
-			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#"
-			count: 1
+			message: "#^Variable \\$method might not be defined\\.$#"
+			count: 2
 			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
 
 		-
-			message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#"
-			count: 1
+			message: "#^Variable \\$part might not be defined\\.$#"
+			count: 2
 			path: app/code/core/Mage/Eav/Model/Entity/Abstract.php
 
 		-
@@ -2830,6 +3255,31 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
 
+		-
+			message: "#^Variable \\$attrArr might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+
+		-
+			message: "#^Variable \\$bindAttribute might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+
+		-
+			message: "#^Variable \\$entity might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+
+		-
+			message: "#^Variable \\$query might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+
+		-
+			message: "#^Variable \\$select might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+
 		-
 			message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#"
 			count: 1
@@ -2860,6 +3310,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Entity/Setup.php
 
+		-
+			message: "#^Variable \\$connection might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Eav/Model/Entity/Setup.php
+
 		-
 			message: "#^Property Mage_Eav_Model_Entity_Type\\:\\:\\$_sets \\(Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection\\) in empty\\(\\) is not falsy\\.$#"
 			count: 1
@@ -2890,6 +3345,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php
 
+		-
+			message: "#^Variable \\$store might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php
+
 		-
 			message: "#^PHPDoc tag @param for parameter \\$object with type Mage_Eav_Model_Resource_Form_Type is incompatible with native type Mage_Core_Model_Abstract\\.$#"
 			count: 2
@@ -3020,6 +3480,11 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
 
+		-
+			message: "#^Variable \\$collection might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
+
 		-
 			message: "#^Binary operation \"\\+\" between string and 50\\|int\\<100, max\\> results in an error\\.$#"
 			count: 1
@@ -3070,6 +3535,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
 
+		-
+			message: "#^Variable \\$entityId might not be defined\\.$#"
+			count: 4
+			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
+
 		-
 			message: "#^Call to an undefined method Varien_Convert_Adapter_Interface\\:\\:delete\\(\\)\\.$#"
 			count: 1
@@ -3145,6 +3615,36 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
 
+		-
+			message: "#^Variable \\$prevOptionId might not be defined\\.$#"
+			count: 4
+			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
+
+		-
+			message: "#^Variable \\$rowSku might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
+
+		-
+			message: "#^Variable \\$sku might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
+
+		-
+			message: "#^Variable \\$productId might not be defined\\.$#"
+			count: 4
+			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php
+
+		-
+			message: "#^Variable \\$productSuperAttrId might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php
+
+		-
+			message: "#^Variable \\$productData might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php
+
 		-
 			message: "#^Method Mage_Index_Model_Lock\\:\\:getInstance\\(\\) should return \\$this\\(Mage_Index_Model_Lock\\) but returns Mage_Index_Model_Lock\\.$#"
 			count: 1
@@ -3275,6 +3775,11 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Log/Model/Resource/Log.php
 
+		-
+			message: "#^Call to function is_null\\(\\) with bool will always evaluate to false\\.$#"
+			count: 1
+			path: app/code/core/Mage/Newsletter/Model/Subscriber.php
+
 		-
 			message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:isPartialAuthorization\\(\\)\\.$#"
 			count: 1
@@ -3285,6 +3790,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paygate/Model/Authorizenet.php
 
+		-
+			message: "#^Variable \\$defaultExceptionMessage might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Paygate/Model/Authorizenet.php
+
+		-
+			message: "#^Variable \\$newTransactionType might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Paygate/Model/Authorizenet.php
+
 		-
 			message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:cancelPartialAuthorization\\(\\)\\.$#"
 			count: 1
@@ -3370,6 +3885,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php
 
+		-
+			message: "#^Variable \\$isAjax might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Paypal/Controller/Express/Abstract.php
+
 		-
 			message: "#^Call to an undefined method Mage_Paypal_Model_Api_Nvp\\:\\:_export\\(\\)\\.$#"
 			count: 1
@@ -3445,6 +3965,11 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Paypal/Model/Express/Checkout.php
 
+		-
+			message: "#^Variable \\$shippingAddress might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Paypal/Model/Express/Checkout.php
+
 		-
 			message: "#^Return type \\(bool\\) of method Mage_Paypal_Model_Hostedpro\\:\\:getAllowedCcTypes\\(\\) should be compatible with return type \\(string\\) of method Mage_Paypal_Model_Direct\\:\\:getAllowedCcTypes\\(\\)$#"
 			count: 1
@@ -3550,6 +4075,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Reports/Block/Product/Abstract.php
 
+		-
+			message: "#^Variable \\$dateStart might not be defined\\.$#"
+			count: 7
+			path: app/code/core/Mage/Reports/Helper/Data.php
+
+		-
+			message: "#^Variable \\$t might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Reports/Helper/Data.php
+
 		-
 			message: "#^Property Mage_Reports_Model_Grouped_Collection\\:\\:\\$_resourceCollection \\(Mage_Core_Model_Resource_Db_Collection_Abstract\\) does not accept Varien_Data_Collection_Db\\.$#"
 			count: 1
@@ -3595,6 +4130,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Reports/Model/Resource/Order/Collection.php
 
+		-
+			message: "#^Variable \\$productViewEvent might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Reports/Model/Resource/Product/Collection.php
+
 		-
 			message: "#^Property Mage_Reports_Model_Resource_Report_Collection\\:\\:\\$_from \\(string\\) does not accept int\\.$#"
 			count: 1
@@ -3785,6 +4325,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php
 
+		-
+			message: "#^Variable \\$oldArea might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Sales/Model/Order/Api.php
+
+		-
+			message: "#^Variable \\$oldStore might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Sales/Model/Order/Api.php
+
 		-
 			message: "#^Property Mage_Sales_Model_Order_Creditmemo\\:\\:\\$_items \\(iterable\\<Mage_Sales_Model_Order_Creditmemo_Item\\>&Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection\\) in empty\\(\\) is not falsy\\.$#"
 			count: 1
@@ -3835,11 +4385,31 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
 
+		-
+			message: "#^Variable \\$order might not be defined\\.$#"
+			count: 12
+			path: app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
+
+		-
+			message: "#^Variable \\$shipment might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
+
+		-
+			message: "#^Variable \\$creditmemo might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php
+
 		-
 			message: "#^Method Mage_Sales_Model_Order_Pdf_Items_Abstract\\:\\:getSku\\(\\) should return string but returns array\\.$#"
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php
 
+		-
+			message: "#^Variable \\$shipment might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php
+
 		-
 			message: "#^Property Mage_Sales_Model_Order_Shipment\\:\\:\\$_items \\(Mage_Sales_Model_Resource_Order_Shipment_Item_Collection\\) in empty\\(\\) is not falsy\\.$#"
 			count: 1
@@ -3905,6 +4475,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Quote/Address.php
 
+		-
+			message: "#^Variable \\$totalInstance might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Sales/Model/Quote/Address.php
+
 		-
 			message: "#^Call to an undefined method Varien_Simplexml_Element\\:\\:getClassName\\(\\)\\.$#"
 			count: 1
@@ -4080,6 +4655,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/controllers/Billing/AgreementController.php
 
+		-
+			message: "#^Variable \\$billingAgreement might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Sales/controllers/Billing/AgreementController.php
+
 		-
 			message: "#^Method Mage_Sales_Recurring_ProfileController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Sales_Recurring_ProfileController\\) but empty return statement found\\.$#"
 			count: 1
@@ -4215,6 +4795,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Tag/Block/Product/Result.php
 
+		-
+			message: "#^Variable \\$result might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tag/Model/Api.php
+
 		-
 			message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Tag_Model_Api_V2\\:\\:_prepareDataForAdd\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Tag_Model_Api\\:\\:_prepareDataForAdd\\(\\)$#"
 			count: 1
@@ -4235,6 +4820,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php
 
+		-
+			message: "#^Variable \\$productsSku might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
+
+		-
+			message: "#^Variable \\$result might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tag/Model/Tag.php
+
 		-
 			message: "#^Call to an undefined method Mage_Tax_Block_Sales_Order_Tax\\:\\:addTotal\\(\\)\\.$#"
 			count: 7
@@ -4290,6 +4885,21 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Tax/Model/Config/Price/Include.php
 
+		-
+			message: "#^Variable \\$selectClone might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Tax/Model/Resource/Calculation.php
+
+		-
+			message: "#^Variable \\$zipFrom might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tax/Model/Resource/Calculation.php
+
+		-
+			message: "#^Variable \\$zipTo might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tax/Model/Resource/Calculation.php
+
 		-
 			message: "#^Return type \\(array\\) of method Mage_Tax_Model_Sales_Total_Quote_Nominal_Tax\\:\\:fetch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Tax_Model_Sales_Total_Quote_Tax\\)\\) of method Mage_Tax_Model_Sales_Total_Quote_Tax\\:\\:fetch\\(\\)$#"
 			count: 1
@@ -4300,6 +4910,46 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
 
+		-
+			message: "#^Variable \\$baseRowTax might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
+		-
+			message: "#^Variable \\$baseTax might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
+		-
+			message: "#^Variable \\$baseTaxBeforeDiscountRounded might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
+		-
+			message: "#^Variable \\$baseUnitTax might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
+		-
+			message: "#^Variable \\$rowTax might not be defined\\.$#"
+			count: 3
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
+		-
+			message: "#^Variable \\$tax might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
+		-
+			message: "#^Variable \\$taxBeforeDiscountRounded might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
+		-
+			message: "#^Variable \\$unitTax might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+
 		-
 			message: "#^Property Mage_Shipping_Model_Carrier_Abstract\\:\\:\\$_code \\(string\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
@@ -4345,6 +4995,31 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
 
+		-
+			message: "#^Variable \\$shipKey might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+
+		-
+			message: "#^Variable \\$shippingLabelContent might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+
+		-
+			message: "#^Variable \\$specialServices might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+
+		-
+			message: "#^Variable \\$trackingNumber might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+
+		-
+			message: "#^Variable \\$xml might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+
 		-
 			message: "#^Access to an undefined property Varien_Object\\:\\:\\$domestic\\.$#"
 			count: 1
@@ -4405,6 +5080,16 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
 
+		-
+			message: "#^Variable \\$package might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
+
+		-
+			message: "#^Variable \\$packageType might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
+
 		-
 			message: "#^Method Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page\\:\\:drawText\\(\\) should return \\$this\\(Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page\\) but returns Zend_Pdf_Canvas_Interface\\.$#"
 			count: 1
@@ -4450,6 +5135,11 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
 
+		-
+			message: "#^Variable \\$errorTitle might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
+
 		-
 			message: "#^Method Mage_Usa_Model_Shipping_Carrier_Ups\\:\\:_getQuotes\\(\\) should return Mage_Shipping_Model_Rate_Result but returns null\\.$#"
 			count: 1
@@ -4480,6 +5170,16 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
 
+		-
+			message: "#^Variable \\$debugData might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
+
+		-
+			message: "#^Variable \\$response might not be defined\\.$#"
+			count: 2
+			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
+
 		-
 			message: "#^Access to an undefined property Mage_Usa_Model_Shipping_Carrier_Usps\\:\\:\\$_rawTrackRequest\\.$#"
 			count: 2
@@ -4560,11 +5260,26 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php
 
+		-
+			message: "#^Variable \\$options might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php
+
+		-
+			message: "#^Variable \\$productsOptions might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+
 		-
 			message: "#^Cannot call method toOptionArray\\(\\) on Mage_Core_Model_Abstract\\|false\\.$#"
 			count: 1
 			path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php
 
+		-
+			message: "#^Variable \\$template might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Widget/Model/Widget/Instance.php
+
 		-
 			message: "#^Parameter \\#1 \\$item \\(Mage_Wishlist_Model_Item\\) of method Mage_Wishlist_Block_Share_Email_Items\\:\\:hasDescription\\(\\) should be compatible with parameter \\$item \\(Mage_Catalog_Model_Product\\) of method Mage_Wishlist_Block_Abstract\\:\\:hasDescription\\(\\)$#"
 			count: 1
@@ -4575,6 +5290,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Wishlist/Helper/Data.php
 
+		-
+			message: "#^Variable \\$params might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Wishlist/Helper/Data.php
+
 		-
 			message: "#^Negated boolean expression is always true\\.$#"
 			count: 1
@@ -4585,6 +5305,11 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Wishlist/Model/Item/Option.php
 
+		-
+			message: "#^Variable \\$item might not be defined\\.$#"
+			count: 1
+			path: app/code/core/Mage/Wishlist/Model/Wishlist.php
+
 		-
 			message: "#^Method Mage_Wishlist_IndexController\\:\\:_addItemToWishList\\(\\) with return type void returns mixed but should not return anything\\.$#"
 			count: 1
@@ -4595,6 +5320,11 @@ parameters:
 			count: 3
 			path: app/code/core/Mage/Wishlist/controllers/IndexController.php
 
+		-
+			message: "#^Variable \\$cronMode might not be defined\\.$#"
+			count: 1
+			path: cron.php
+
 		-
 			message: "#^Comparison operation \"\\>\\=\" between int\\<0, max\\> and 0 is always true\\.$#"
 			count: 1
@@ -4675,6 +5405,11 @@ parameters:
 			count: 1
 			path: lib/Varien/Convert/Mapper/Column.php
 
+		-
+			message: "#^Variable \\$data might not be defined\\.$#"
+			count: 3
+			path: lib/Varien/Convert/Parser/Xml/Excel.php
+
 		-
 			message: "#^Cannot access property \\$_items on array\\.$#"
 			count: 2
@@ -4730,11 +5465,21 @@ parameters:
 			count: 1
 			path: lib/Varien/Data/Form/Element/Multiline.php
 
+		-
+			message: "#^Variable \\$node might not be defined\\.$#"
+			count: 1
+			path: lib/Varien/Data/Tree.php
+
 		-
 			message: "#^Method Varien_Data_Tree\\:\\:load\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#"
 			count: 1
 			path: lib/Varien/Data/Tree/Node.php
 
+		-
+			message: "#^Variable \\$result might not be defined\\.$#"
+			count: 1
+			path: lib/Varien/Db/Adapter/Mysqli.php
+
 		-
 			message: "#^Cannot access offset 'Engine' on bool\\.$#"
 			count: 1
@@ -4775,6 +5520,11 @@ parameters:
 			count: 1
 			path: lib/Varien/Db/Adapter/Pdo/Mysql.php
 
+		-
+			message: "#^Variable \\$result might not be defined\\.$#"
+			count: 3
+			path: lib/Varien/Db/Adapter/Pdo/Mysql.php
+
 		-
 			message: "#^Cannot call method bindParam\\(\\) on object\\|resource\\.$#"
 			count: 1
@@ -4834,3 +5584,22 @@ parameters:
 			message: "#^Strict comparison using \\=\\=\\= between mixed and false will always evaluate to false\\.$#"
 			count: 1
 			path: lib/Varien/Simplexml/Config.php
+		-
+			message: "#^Variable \\$aInfo might not be defined\\.$#"
+			count: 2
+			path: lib/Varien/Db/Tree.php
+
+		-
+			message: "#^Variable \\$pInfo might not be defined\\.$#"
+			count: 4
+			path: lib/Varien/Db/Tree.php
+
+		-
+			message: "#^Variable \\$sql might not be defined\\.$#"
+			count: 2
+			path: lib/Varien/Db/Tree.php
+
+		-
+			message: "#^Variable \\$methodName might not be defined\\.$#"
+			count: 2
+			path: lib/Varien/Debug.php
diff --git a/phpstan.dist.issues.neon b/phpstan.dist.issues.neon
deleted file mode 100644
index 3c05c5a34c8..00000000000
--- a/phpstan.dist.issues.neon
+++ /dev/null
@@ -1,7 +0,0 @@
-parameters:
-  ignoreErrors:
-    # Level 2
-    - "#Variable \\$+[a-zA-Z_]+ might not be defined.#"
-    -
-      message: "#Call to function is_null\\(\\) with bool will always evaluate to false.$#"
-      path: app/code/core/Mage/Newsletter/Model/Subscriber.php
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index eb99f86b075..76417afeff9 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -1,6 +1,5 @@
 includes:
     - vendor/macopedia/phpstan-magento1/extension.neon
-    - phpstan.dist.issues.neon
     - phpstan.dist.baseline.neon
     - phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
diff --git a/shell/rename-mysql4-class-to-resource.php b/shell/rename-mysql4-class-to-resource.php
new file mode 100644
index 00000000000..92d2b4ec296
--- /dev/null
+++ b/shell/rename-mysql4-class-to-resource.php
@@ -0,0 +1,583 @@
+<?php
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   Mage
+ * @package    Mage_Shell
+ * @copyright  Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+// DO NOT RUN DIRECTLY IN YOUR PRODUCTION ENVIRONMENT!
+// See https://github.com/OpenMage/magento-lts/pull/2730
+chdir(dirname(__DIR__, 1));
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+if (PHP_SAPI != 'cli') {
+    exit(0);
+}
+
+$todo = [
+    'Mage_Admin_Model_Mysql4_Acl' => 'Mage_Admin_Model_Resource_Acl',
+    'Mage_Admin_Model_Mysql4_Acl_Role' => 'Mage_Admin_Model_Resource_Acl_Role',
+    'Mage_Admin_Model_Mysql4_Acl_Role_Collection' => 'Mage_Admin_Model_Resource_Acl_Role_Collection',
+    'Mage_Admin_Model_Mysql4_Permissions_Collection' => 'Mage_Admin_Model_Resource_Permissions_Collection',
+    'Mage_Admin_Model_Mysql4_Role' => 'Mage_Admin_Model_Resource_Role',
+    'Mage_Admin_Model_Mysql4_Role_Collection' => 'Mage_Admin_Model_Resource_Role_Collection',
+    'Mage_Admin_Model_Mysql4_Roles' => 'Mage_Admin_Model_Resource_Roles',
+    'Mage_Admin_Model_Mysql4_Roles_Collection' => 'Mage_Admin_Model_Resource_Roles_Collection',
+    'Mage_Admin_Model_Mysql4_Roles_User_Collection' => 'Mage_Admin_Model_Resource_Roles_User_Collection',
+    'Mage_Admin_Model_Mysql4_Rules' => 'Mage_Admin_Model_Resource_Rules',
+    'Mage_Admin_Model_Mysql4_Rules_Collection' => 'Mage_Admin_Model_Resource_Rules_Collection',
+    'Mage_Admin_Model_Mysql4_User' => 'Mage_Admin_Model_Resource_User',
+    'Mage_Admin_Model_Mysql4_User_Collection' => 'Mage_Admin_Model_Resource_User_Collection',
+    'Mage_AdminNotification_Model_Mysql4_Inbox' => 'Mage_AdminNotification_Model_Resource_Inbox',
+    'Mage_AdminNotification_Model_Mysql4_Inbox_Collection' => 'Mage_AdminNotification_Model_Resource_Inbox_Collection',
+    'Mage_Api_Model_Mysql4_Acl' => 'Mage_Api_Model_Resource_Acl',
+    'Mage_Api_Model_Mysql4_Acl_Role' => 'Mage_Api_Model_Resource_Acl_Role',
+    'Mage_Api_Model_Mysql4_Acl_Role_Collection' => 'Mage_Api_Model_Resource_Acl_Role_Collection',
+    'Mage_Api_Model_Mysql4_Permissions_Collection' => 'Mage_Api_Model_Resource_Permissions_Collection',
+    'Mage_Api_Model_Mysql4_Role' => 'Mage_Api_Model_Resource_Role',
+    'Mage_Api_Model_Mysql4_Role_Collection' => 'Mage_Api_Model_Resource_Role_Collection',
+    'Mage_Api_Model_Mysql4_Roles' => 'Mage_Api_Model_Resource_Roles',
+    'Mage_Api_Model_Mysql4_Roles_Collection' => 'Mage_Api_Model_Resource_Roles_Collection',
+    'Mage_Api_Model_Mysql4_Roles_User_Collection' => 'Mage_Api_Model_Resource_Roles_User_Collection',
+    'Mage_Api_Model_Mysql4_Rules' => 'Mage_Api_Model_Resource_Rules',
+    'Mage_Api_Model_Mysql4_Rules_Collection' => 'Mage_Api_Model_Resource_Rules_Collection',
+    'Mage_Api_Model_Mysql4_User' => 'Mage_Api_Model_Resource_User',
+    'Mage_Api_Model_Mysql4_User_Collection' => 'Mage_Api_Model_Resource_User_Collection',
+    'Mage_Backup_Model_Mysql4_Db' => 'Mage_Backup_Model_Resource_Db',
+    'Mage_Bundle_Model_Mysql4_Bundle' => 'Mage_Bundle_Model_Resource_Bundle',
+    'Mage_Bundle_Model_Mysql4_Indexer_Price' => 'Mage_Bundle_Model_Resource_Indexer_Price',
+    'Mage_Bundle_Model_Mysql4_Indexer_Stock' => 'Mage_Bundle_Model_Resource_Indexer_Stock',
+    'Mage_Bundle_Model_Mysql4_Option' => 'Mage_Bundle_Model_Resource_Option',
+    'Mage_Bundle_Model_Mysql4_Option_Collection' => 'Mage_Bundle_Model_Resource_Option_Collection',
+    'Mage_Bundle_Model_Mysql4_Price_Index' => 'Mage_Bundle_Model_Resource_Price_Index',
+    'Mage_Bundle_Model_Mysql4_Selection' => 'Mage_Bundle_Model_Resource_Selection',
+    'Mage_Bundle_Model_Mysql4_Selection_Collection' => 'Mage_Bundle_Model_Resource_Selection_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract' => 'Mage_Catalog_Model_Resource_Abstract',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute' => 'Mage_Catalog_Model_Resource_Attribute',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category' => 'Mage_Catalog_Model_Resource_Category',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection' => 'Mage_Catalog_Model_Resource_Category_Attribute_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image' => 'Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout' => 'Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode' => 'Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page' => 'Mage_Catalog_Model_Resource_Category_Attribute_Source_Page',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection' => 'Mage_Catalog_Model_Resource_Category_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat' => 'Mage_Catalog_Model_Resource_Category_Flat',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection' => 'Mage_Catalog_Model_Resource_Category_Flat_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product' => 'Mage_Catalog_Model_Resource_Category_Indexer_Product',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree' => 'Mage_Catalog_Model_Resource_Category_Tree',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract' => 'Mage_Catalog_Model_Resource_Collection_Abstract',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Config' => 'Mage_Catalog_Model_Resource_Config',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute' => 'Mage_Catalog_Model_Resource_Layer_Filter_Attribute',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal' => 'Mage_Catalog_Model_Resource_Layer_Filter_Decimal',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price' => 'Mage_Catalog_Model_Resource_Layer_Filter_Price',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product' => 'Mage_Catalog_Model_Resource_Product',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action' => 'Mage_Catalog_Model_Resource_Product_Action',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection' => 'Mage_Catalog_Model_Resource_Product_Attribute_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image' => 'Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice' => 'Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection' => 'Mage_Catalog_Model_Resource_Product_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item' => 'Mage_Catalog_Model_Resource_Product_Compare_Item',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection' => 'Mage_Catalog_Model_Resource_Product_Compare_Item_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat' => 'Mage_Catalog_Model_Resource_Product_Flat',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer' => 'Mage_Catalog_Model_Resource_Product_Flat_Indexer',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract' => 'Mage_Catalog_Model_Resource_Product_Indexer_Abstract',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Default',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link' => 'Mage_Catalog_Model_Resource_Product_Link',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection' => 'Mage_Catalog_Model_Resource_Product_Link_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection' => 'Mage_Catalog_Model_Resource_Product_Link_Product_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option' => 'Mage_Catalog_Model_Resource_Product_Option',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection' => 'Mage_Catalog_Model_Resource_Product_Option_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value' => 'Mage_Catalog_Model_Resource_Product_Option_Value',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection' => 'Mage_Catalog_Model_Resource_Product_Option_Value_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation' => 'Mage_Catalog_Model_Resource_Product_Relation',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status' => 'Mage_Catalog_Model_Resource_Product_Status',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website' => 'Mage_Catalog_Model_Resource_Product_Website',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend' => 'Mage_Sendfriend_Model_Resource_Sendfriend',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection' => 'Mage_Sendfriend_Model_Resource_Sendfriend_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Setup' => 'Mage_Catalog_Model_Resource_Setup',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Url' => 'Mage_Catalog_Model_Resource_Url',
+    'Mage_CatalogIndex_Model_Mysql4_Abstract' => 'Mage_CatalogIndex_Model_Resource_Abstract',
+    'Mage_CatalogIndex_Model_Mysql4_Aggregation' => 'Mage_CatalogIndex_Model_Resource_Aggregation',
+    'Mage_CatalogIndex_Model_Mysql4_Attribute' => 'Mage_CatalogIndex_Model_Resource_Attribute',
+    'Mage_CatalogIndex_Model_Mysql4_Data_Abstract' => 'Mage_CatalogIndex_Model_Resource_Data_Abstract',
+    'Mage_CatalogIndex_Model_Mysql4_Data_Configurable' => 'Mage_CatalogIndex_Model_Resource_Data_Configurable',
+    'Mage_CatalogIndex_Model_Mysql4_Data_Grouped' => 'Mage_CatalogIndex_Model_Resource_Data_Grouped',
+    'Mage_CatalogIndex_Model_Mysql4_Indexer' => 'Mage_CatalogIndex_Model_Resource_Indexer',
+    'Mage_CatalogIndex_Model_Mysql4_Indexer_Abstract' => 'Mage_CatalogIndex_Model_Resource_Indexer_Abstract',
+    'Mage_CatalogIndex_Model_Mysql4_Indexer_Eav' => 'Mage_CatalogIndex_Model_Resource_Indexer_Eav',
+    'Mage_CatalogIndex_Model_Mysql4_Indexer_Minimalprice' => 'Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice',
+    'Mage_CatalogIndex_Model_Mysql4_Indexer_Price' => 'Mage_CatalogIndex_Model_Resource_Indexer_Price',
+    'Mage_CatalogIndex_Model_Mysql4_Price' => 'Mage_CatalogIndex_Model_Resource_Price',
+    'Mage_CatalogIndex_Model_Mysql4_Retreiver' => 'Mage_CatalogIndex_Model_Resource_Retreiver',
+    'Mage_CatalogIndex_Model_Mysql4_Setup' => 'Mage_CatalogIndex_Model_Resource_Setup',
+    'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock',
+    'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Configurable' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable',
+    'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Default' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default',
+    'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Grouped' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped',
+    'Mage_CatalogInventory_Model_Mysql4_Stock' => 'Mage_CatalogInventory_Model_Resource_Stock',
+    'Mage_CatalogInventory_Model_Mysql4_Stock_Item' => 'Mage_CatalogInventory_Model_Resource_Stock_Item',
+    'Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection' => 'Mage_CatalogInventory_Model_Resource_Stock_Item_Collection',
+    'Mage_CatalogInventory_Model_Mysql4_Stock_Status' => 'Mage_CatalogInventory_Model_Resource_Stock_Status',
+    'Mage_CatalogRule_Model_Mysql4_Rule' => 'Mage_CatalogRule_Model_Resource_Rule',
+    'Mage_CatalogRule_Model_Mysql4_Rule_Collection' => 'Mage_CatalogRule_Model_Resource_Rule_Collection',
+    'Mage_CatalogRule_Model_Mysql4_Rule_Product_Price' => 'Mage_CatalogRule_Model_Resource_Rule_Product_Price',
+    'Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection' => 'Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection',
+    'Mage_CatalogSearch_Model_Mysql4_Advanced' => 'Mage_CatalogSearch_Model_Resource_Advanced',
+    'Mage_CatalogSearch_Model_Mysql4_Advanced_Collection' => 'Mage_CatalogSearch_Model_Resource_Advanced_Collection',
+    'Mage_CatalogSearch_Model_Mysql4_Fulltext' => 'Mage_CatalogSearch_Model_Resource_Fulltext',
+    'Mage_CatalogSearch_Model_Mysql4_Fulltext_Collection' => 'Mage_CatalogSearch_Model_Resource_Fulltext_Collection',
+    'Mage_CatalogSearch_Model_Mysql4_Fulltext_Engine' => 'Mage_CatalogSearch_Model_Resource_Fulltext_Engine',
+    'Mage_CatalogSearch_Model_Mysql4_Indexer_Fulltext' => 'Mage_CatalogSearch_Model_Resource_Indexer_Fulltext',
+    'Mage_CatalogSearch_Model_Mysql4_Query' => 'Mage_CatalogSearch_Model_Resource_Query',
+    'Mage_CatalogSearch_Model_Mysql4_Query_Collection' => 'Mage_CatalogSearch_Model_Resource_Query_Collection',
+    'Mage_CatalogSearch_Model_Mysql4_Search_Collection' => 'Mage_CatalogSearch_Model_Resource_Search_Collection',
+    'Mage_Checkout_Model_Mysql4_Agreement' => 'Mage_Checkout_Model_Resource_Agreement',
+    'Mage_Checkout_Model_Mysql4_Agreement_Collection' => 'Mage_Checkout_Model_Resource_Agreement_Collection',
+    'Mage_Checkout_Model_Mysql4_Cart' => 'Mage_Checkout_Model_Resource_Cart',
+    'Mage_Checkout_Model_Mysql4_Setup' => 'Mage_Checkout_Model_Resource_Setup',
+    'Mage_Cms_Model_Mysql4_Block' => 'Mage_Cms_Model_Resource_Block',
+    'Mage_Cms_Model_Mysql4_Block_Collection' => 'Mage_Cms_Model_Resource_Block_Collection',
+    'Mage_Cms_Model_Mysql4_Page' => 'Mage_Cms_Model_Resource_Page',
+    'Mage_Cms_Model_Mysql4_Page_Collection' => 'Mage_Cms_Model_Resource_Page_Collection',
+    'Mage_Cms_Model_Mysql4_Page_Service' => 'Mage_Cms_Model_Resource_Page_Service',
+    'Mage_Core_Model_Mysql4_Abstract' => 'Mage_Core_Model_Resource_Db_Abstract',
+    'Mage_Core_Model_Mysql4_Cache' => 'Mage_Core_Model_Resource_Cache',
+    'Mage_Core_Model_Mysql4_Collection_Abstract' => 'Mage_Core_Model_Resource_Db_Collection_Abstract',
+    'Mage_Core_Model_Mysql4_Config' => 'Mage_Core_Model_Resource_Config',
+    'Mage_Core_Model_Mysql4_Config_Data' => 'Mage_Core_Model_Resource_Config_Data',
+    'Mage_Core_Model_Mysql4_Config_Data_Collection' => 'Mage_Core_Model_Resource_Config_Data_Collection',
+    'Mage_Core_Model_Mysql4_Design' => 'Mage_Core_Model_Resource_Design',
+    'Mage_Core_Model_Mysql4_Design_Collection' => 'Mage_Core_Model_Resource_Design_Collection',
+    'Mage_Core_Model_Mysql4_Design_Package_Collection' => 'Mage_Core_Model_Resource_Design_Package_Collection',
+    'Mage_Core_Model_Mysql4_Design_Theme_Collection' => 'Varien_Directory_Collection',
+    'Mage_Core_Model_Mysql4_Email_Template' => 'Mage_Core_Model_Resource_Email_Template',
+    'Mage_Core_Model_Mysql4_Email_Template_Collection' => 'Mage_Core_Model_Resource_Email_Template_Collection',
+    'Mage_Core_Model_Mysql4_File_Storage_Abstract' => 'Mage_Core_Model_Resource_File_Storage_Abstract',
+    'Mage_Core_Model_Mysql4_File_Storage_Database' => 'Mage_Core_Model_Resource_File_Storage_Database',
+    'Mage_Core_Model_Mysql4_File_Storage_Directory_Database' => 'Mage_Core_Model_Resource_File_Storage_Directory_Database',
+    'Mage_Core_Model_Mysql4_File_Storage_File' => 'Mage_Core_Model_Resource_File_Storage_File',
+    'Mage_Core_Model_Mysql4_Flag' => 'Mage_Core_Model_Resource_Flag',
+    'Mage_Core_Model_Mysql4_Language' => 'Mage_Core_Model_Resource_Language',
+    'Mage_Core_Model_Mysql4_Language_Collection' => 'Mage_Core_Model_Resource_Language_Collection',
+    'Mage_Core_Model_Mysql4_Layout' => 'Mage_Core_Model_Resource_Layout',
+    'Mage_Core_Model_Mysql4_Resource' => 'Mage_Core_Model_Resource_Resource',
+    'Mage_Core_Model_Mysql4_Session' => 'Mage_Core_Model_Resource_Session',
+    'Mage_Core_Model_Mysql4_Store' => 'Mage_Core_Model_Resource_Store',
+    'Mage_Core_Model_Mysql4_Store_Collection' => 'Mage_Core_Model_Resource_Store_Collection',
+    'Mage_Core_Model_Mysql4_Store_Group' => 'Mage_Core_Model_Resource_Store_Group',
+    'Mage_Core_Model_Mysql4_Store_Group_Collection' => 'Mage_Core_Model_Resource_Store_Group_Collection',
+    'Mage_Core_Model_Mysql4_Translate' => 'Mage_Core_Model_Resource_Translate',
+    'Mage_Core_Model_Mysql4_Translate_String' => 'Mage_Core_Model_Resource_Translate_String',
+    'Mage_Core_Model_Mysql4_Url_Rewrite' => 'Mage_Core_Model_Resource_Url_Rewrite',
+    'Mage_Core_Model_Mysql4_Url_Rewrite_Collection' => 'Mage_Core_Model_Resource_Url_Rewrite_Collection',
+    'Mage_Core_Model_Mysql4_Variable' => 'Mage_Core_Model_Resource_Variable',
+    'Mage_Core_Model_Mysql4_Variable_Collection' => 'Mage_Core_Model_Resource_Variable_Collection',
+    'Mage_Core_Model_Mysql4_Website' => 'Mage_Core_Model_Resource_Website',
+    'Mage_Core_Model_Mysql4_Website_Collection' => 'Mage_Core_Model_Resource_Website_Collection',
+    'Mage_Cron_Model_Mysql4_Schedule' => 'Mage_Cron_Model_Resource_Schedule',
+    'Mage_Cron_Model_Mysql4_Schedule_Collection' => 'Mage_Cron_Model_Resource_Schedule_Collection',
+    'Mage_Dataflow_Model_Mysql4_Batch' => 'Mage_Dataflow_Model_Resource_Batch',
+    'Mage_Dataflow_Model_Mysql4_Batch_Abstract' => 'Mage_Dataflow_Model_Resource_Batch_Abstract',
+    'Mage_Dataflow_Model_Mysql4_Batch_Collection' => 'Mage_Dataflow_Model_Resource_Batch_Collection',
+    'Mage_Dataflow_Model_Mysql4_Batch_Export' => 'Mage_Dataflow_Model_Resource_Batch_Export',
+    'Mage_Dataflow_Model_Mysql4_Batch_Import' => 'Mage_Dataflow_Model_Resource_Batch_Import',
+    'Mage_Dataflow_Model_Mysql4_Import' => 'Mage_Dataflow_Model_Resource_Import',
+    'Mage_Dataflow_Model_Mysql4_Import_Collection' => 'Mage_Dataflow_Model_Resource_Import_Collection',
+    'Mage_Dataflow_Model_Mysql4_Profile' => 'Mage_Dataflow_Model_Resource_Profile',
+    'Mage_Dataflow_Model_Mysql4_Profile_Collection' => 'Mage_Dataflow_Model_Resource_Profile_Collection',
+    'Mage_Dataflow_Model_Mysql4_Profile_History' => 'Mage_Dataflow_Model_Resource_Profile_History',
+    'Mage_Dataflow_Model_Mysql4_Profile_History_Collection' => 'Mage_Dataflow_Model_Resource_Profile_History_Collection',
+    'Mage_Dataflow_Model_Mysql4_Session' => 'Mage_Dataflow_Model_Resource_Session',
+    'Mage_Directory_Model_Mysql4_Country' => 'Mage_Directory_Model_Resource_Country',
+    'Mage_Directory_Model_Mysql4_Country_Collection' => 'Mage_Directory_Model_Resource_Country_Collection',
+    'Mage_Directory_Model_Mysql4_Country_Format' => 'Mage_Directory_Model_Resource_Country_Format',
+    'Mage_Directory_Model_Mysql4_Country_Format_Collection' => 'Mage_Directory_Model_Resource_Country_Format_Collection',
+    'Mage_Directory_Model_Mysql4_Currency' => 'Mage_Directory_Model_Resource_Currency',
+    'Mage_Directory_Model_Mysql4_Currency_Collection' => 'Mage_Directory_Model_Resource_Currency_Collection',
+    'Mage_Directory_Model_Mysql4_Region' => 'Mage_Directory_Model_Resource_Region',
+    'Mage_Directory_Model_Mysql4_Region_Collection' => 'Mage_Directory_Model_Resource_Region_Collection',
+    'Mage_Downloadable_Model_Mysql4_Indexer_Price' => 'Mage_Downloadable_Model_Resource_Indexer_Price',
+    'Mage_Downloadable_Model_Mysql4_Link' => 'Mage_Downloadable_Model_Resource_Link',
+    'Mage_Downloadable_Model_Mysql4_Link_Collection' => 'Mage_Downloadable_Model_Resource_Link_Collection',
+    'Mage_Downloadable_Model_Mysql4_Link_Purchased' => 'Mage_Downloadable_Model_Resource_Link_Purchased',
+    'Mage_Downloadable_Model_Mysql4_Link_Purchased_Collection' => 'Mage_Downloadable_Model_Resource_Link_Purchased_Collection',
+    'Mage_Downloadable_Model_Mysql4_Link_Purchased_Item' => 'Mage_Downloadable_Model_Resource_Link_Purchased_Item',
+    'Mage_Downloadable_Model_Mysql4_Link_Purchased_Item_Collection' => 'Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection',
+    'Mage_Downloadable_Model_Mysql4_Sample' => 'Mage_Downloadable_Model_Resource_Sample',
+    'Mage_Downloadable_Model_Mysql4_Sample_Collection' => 'Mage_Downloadable_Model_Resource_Sample_Collection',
+    'Mage_Eav_Model_Mysql4_Config' => 'Mage_Eav_Model_Resource_Config',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute' => 'Mage_Eav_Model_Resource_Entity_Attribute',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Collection',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute_Group' => 'Mage_Eav_Model_Resource_Entity_Attribute_Group',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute_Group_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute_Option' => 'Mage_Eav_Model_Resource_Entity_Attribute_Option',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute_Option_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute_Set' => 'Mage_Eav_Model_Resource_Entity_Attribute_Set',
+    'Mage_Eav_Model_Mysql4_Entity_Attribute_Set_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection',
+    'Mage_Eav_Model_Mysql4_Entity_Store' => 'Mage_Eav_Model_Resource_Entity_Store',
+    'Mage_Eav_Model_Mysql4_Entity_Type' => 'Mage_Eav_Model_Resource_Entity_Type',
+    'Mage_Eav_Model_Mysql4_Entity_Type_Collection' => 'Mage_Eav_Model_Resource_Entity_Type_Collection',
+    'Mage_Eav_Model_Mysql4_Form_Element' => 'Mage_Eav_Model_Resource_Form_Element',
+    'Mage_Eav_Model_Mysql4_Form_Element_Collection' => 'Mage_Eav_Model_Resource_Form_Element_Collection',
+    'Mage_Eav_Model_Mysql4_Form_Fieldset' => 'Mage_Eav_Model_Resource_Form_Fieldset',
+    'Mage_Eav_Model_Mysql4_Form_Fieldset_Collection' => 'Mage_Eav_Model_Resource_Form_Fieldset_Collection',
+    'Mage_Eav_Model_Mysql4_Form_Type' => 'Mage_Eav_Model_Resource_Form_Type',
+    'Mage_Eav_Model_Mysql4_Form_Type_Collection' => 'Mage_Eav_Model_Resource_Form_Type_Collection',
+    'Mage_GiftMessage_Model_Mysql4_Message' => 'Mage_GiftMessage_Model_Resource_Message',
+    'Mage_GiftMessage_Model_Mysql4_Message_Collection' => 'Mage_GiftMessage_Model_Resource_Message_Collection',
+    'Mage_GiftMessage_Model_Mysql4_Setup' => 'Mage_GiftMessage_Model_Resource_Setup',
+    'Mage_ImportExport_Model_Mysql4_Import_Data' => 'Mage_ImportExport_Model_Resource_Import_Data',
+    'Mage_ImportExport_Model_Mysql4_Setup' => 'Mage_ImportExport_Model_Resource_Setup',
+    'Mage_Index_Model_Mysql4_Abstract' => 'Mage_Index_Model_Resource_Abstract',
+    'Mage_Index_Model_Mysql4_Event' => 'Mage_Index_Model_Resource_Event',
+    'Mage_Index_Model_Mysql4_Event_Collection' => 'Mage_Index_Model_Resource_Event_Collection',
+    'Mage_Index_Model_Mysql4_Process' => 'Mage_Index_Model_Resource_Process',
+    'Mage_Index_Model_Mysql4_Process_Collection' => 'Mage_Index_Model_Resource_Process_Collection',
+    'Mage_Index_Model_Mysql4_Setup' => 'Mage_Index_Model_Resource_Setup',
+    'Mage_Log_Model_Mysql4_Aggregation' => 'Mage_Log_Model_Resource_Aggregation',
+    'Mage_Log_Model_Mysql4_Customer' => 'Mage_Log_Model_Resource_Customer',
+    'Mage_Log_Model_Mysql4_Log' => 'Mage_Log_Model_Resource_Log',
+    'Mage_Log_Model_Mysql4_Visitor' => 'Mage_Log_Model_Resource_Visitor',
+    'Mage_Log_Model_Mysql4_Visitor_Collection' => 'Mage_Log_Model_Resource_Visitor_Collection',
+    'Mage_Log_Model_Mysql4_Visitor_Online' => 'Mage_Log_Model_Resource_Visitor_Online',
+    'Mage_Log_Model_Mysql4_Visitor_Online_Collection' => 'Mage_Log_Model_Resource_Visitor_Online_Collection',
+    'Mage_Newsletter_Model_Mysql4_Problem' => 'Mage_Newsletter_Model_Resource_Problem',
+    'Mage_Newsletter_Model_Mysql4_Problem_Collection' => 'Mage_Newsletter_Model_Resource_Problem_Collection',
+    'Mage_Newsletter_Model_Mysql4_Queue' => 'Mage_Newsletter_Model_Resource_Queue',
+    'Mage_Newsletter_Model_Mysql4_Queue_Collection' => 'Mage_Newsletter_Model_Resource_Queue_Collection',
+    'Mage_Newsletter_Model_Mysql4_Subscriber' => 'Mage_Newsletter_Model_Resource_Subscriber',
+    'Mage_Newsletter_Model_Mysql4_Subscriber_Collection' => 'Mage_Newsletter_Model_Resource_Subscriber_Collection',
+    'Mage_Newsletter_Model_Mysql4_Template' => 'Mage_Newsletter_Model_Resource_Template',
+    'Mage_Newsletter_Model_Mysql4_Template_Collection' => 'Mage_Newsletter_Model_Resource_Template_Collection',
+    'Mage_Paygate_Model_Mysql4_Authorizenet_Debug' => 'Mage_Paygate_Model_Resource_Authorizenet_Debug',
+    'Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection' => 'Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection',
+    'Mage_Paypal_Model_Mysql4_Cert' => 'Mage_Paypal_Model_Resource_Cert',
+    'Mage_Paypal_Model_Mysql4_Report_Settlement' => 'Mage_Paypal_Model_Resource_Report_Settlement',
+    'Mage_Paypal_Model_Mysql4_Report_Settlement_Row' => 'Mage_Paypal_Model_Resource_Report_Settlement_Row',
+    'Mage_Paypal_Model_Mysql4_Report_Settlement_Row_Collection' => 'Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection',
+    'Mage_Paypal_Model_Mysql4_Setup' => 'Mage_Paypal_Model_Resource_Setup',
+    'Mage_Poll_Model_Mysql4_Poll' => 'Mage_Poll_Model_Resource_Poll',
+    'Mage_Poll_Model_Mysql4_Poll_Answer' => 'Mage_Poll_Model_Resource_Poll_Answer',
+    'Mage_Poll_Model_Mysql4_Poll_Answer_Collection' => 'Mage_Poll_Model_Resource_Poll_Answer_Collection',
+    'Mage_Poll_Model_Mysql4_Poll_Collection' => 'Mage_Poll_Model_Resource_Poll_Collection',
+    'Mage_Poll_Model_Mysql4_Poll_Vote' => 'Mage_Poll_Model_Resource_Poll_Vote',
+    'Mage_ProductAlert_Model_Mysql4_Price' => 'Mage_ProductAlert_Model_Resource_Price',
+    'Mage_ProductAlert_Model_Mysql4_Price_Collection' => 'Mage_ProductAlert_Model_Resource_Price_Collection',
+    'Mage_ProductAlert_Model_Mysql4_Price_Customer_Collection' => 'Mage_ProductAlert_Model_Resource_Price_Customer_Collection',
+    'Mage_ProductAlert_Model_Mysql4_Stock' => 'Mage_ProductAlert_Model_Resource_Stock',
+    'Mage_ProductAlert_Model_Mysql4_Stock_Collection' => 'Mage_ProductAlert_Model_Resource_Stock_Collection',
+    'Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection' => 'Mage_ProductAlert_Model_Resource_Stock_Customer_Collection',
+    'Mage_Rating_Model_Mysql4_Rating' => 'Mage_Rating_Model_Resource_Rating',
+    'Mage_Rating_Model_Mysql4_Rating_Collection' => 'Mage_Rating_Model_Resource_Rating_Collection',
+    'Mage_Rating_Model_Mysql4_Rating_Entity' => 'Mage_Rating_Model_Resource_Rating_Entity',
+    'Mage_Rating_Model_Mysql4_Rating_Option' => 'Mage_Rating_Model_Resource_Rating_Option',
+    'Mage_Rating_Model_Mysql4_Rating_Option_Collection' => 'Mage_Rating_Model_Resource_Rating_Option_Collection',
+    'Mage_Rating_Model_Mysql4_Rating_Option_Vote' => 'Mage_Rating_Model_Resource_Rating_Option_Vote',
+    'Mage_Rating_Model_Mysql4_Rating_Option_Vote_Collection' => 'Mage_Rating_Model_Resource_Rating_Option_Vote_Collection',
+    'Mage_Reports_Model_Mysql4_Accounts_Collection' => 'Mage_Reports_Model_Resource_Accounts_Collection',
+    'Mage_Reports_Model_Mysql4_Coupons_Collection' => 'Mage_Reports_Model_Resource_Coupons_Collection',
+    'Mage_Reports_Model_Mysql4_Customer_Collection' => 'Mage_Reports_Model_Resource_Customer_Collection',
+    'Mage_Reports_Model_Mysql4_Customer_Orders_Collection' => 'Mage_Reports_Model_Resource_Customer_Orders_Collection',
+    'Mage_Reports_Model_Mysql4_Customer_Totals_Collection' => 'Mage_Reports_Model_Resource_Customer_Totals_Collection',
+    'Mage_Reports_Model_Mysql4_Entity_Summary_Collection_Abstract' => 'Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract',
+    'Mage_Reports_Model_Mysql4_Event' => 'Mage_Reports_Model_Resource_Event',
+    'Mage_Reports_Model_Mysql4_Event_Collection' => 'Mage_Reports_Model_Resource_Event_Collection',
+    'Mage_Reports_Model_Mysql4_Event_Type' => 'Mage_Reports_Model_Resource_Event_Type',
+    'Mage_Reports_Model_Mysql4_Event_Type_Collection' => 'Mage_Reports_Model_Resource_Event_Type_Collection',
+    'Mage_Reports_Model_Mysql4_Invoiced_Collection' => 'Mage_Reports_Model_Resource_Invoiced_Collection',
+    'Mage_Reports_Model_Mysql4_Order_Collection' => 'Mage_Reports_Model_Resource_Order_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Collection' => 'Mage_Reports_Model_Resource_Product_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Downloads_Collection' => 'Mage_Reports_Model_Resource_Product_Downloads_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Index_Abstract' => 'Mage_Reports_Model_Resource_Product_Index_Abstract',
+    'Mage_Reports_Model_Mysql4_Product_Index_Collection_Abstract' => 'Mage_Reports_Model_Resource_Product_Index_Collection_Abstract',
+    'Mage_Reports_Model_Mysql4_Product_Index_Compared' => 'Mage_Reports_Model_Resource_Product_Index_Compared',
+    'Mage_Reports_Model_Mysql4_Product_Index_Compared_Collection' => 'Mage_Reports_Model_Resource_Product_Index_Compared_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Index_Viewed' => 'Mage_Reports_Model_Resource_Product_Index_Viewed',
+    'Mage_Reports_Model_Mysql4_Product_Index_Viewed_Collection' => 'Mage_Reports_Model_Resource_Product_Index_Viewed_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Lowstock_Collection' => 'Mage_Reports_Model_Resource_Product_Lowstock_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Ordered_Collection' => 'Mage_Reports_Model_Resource_Product_Ordered_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Sold_Collection' => 'Mage_Reports_Model_Resource_Product_Sold_Collection',
+    'Mage_Reports_Model_Mysql4_Product_Viewed_Collection' => 'Mage_Reports_Model_Resource_Product_Viewed_Collection',
+    'Mage_Reports_Model_Mysql4_Quote_Collection' => 'Mage_Reports_Model_Resource_Quote_Collection',
+    'Mage_Reports_Model_Mysql4_Refunded_Collection' => 'Mage_Reports_Model_Resource_Refunded_Collection',
+    'Mage_Reports_Model_Mysql4_Report_Abstract' => 'Mage_Reports_Model_Resource_Report_Abstract',
+    'Mage_Reports_Model_Mysql4_Report_Collection' => 'Mage_Reports_Model_Resource_Report_Collection',
+    'Mage_Reports_Model_Mysql4_Review_Collection' => 'Mage_Reports_Model_Resource_Review_Collection',
+    'Mage_Reports_Model_Mysql4_Review_Customer_Collection' => 'Mage_Reports_Model_Resource_Review_Customer_Collection',
+    'Mage_Reports_Model_Mysql4_Review_Product_Collection' => 'Mage_Reports_Model_Resource_Review_Product_Collection',
+    'Mage_Reports_Model_Mysql4_Shipping_Collection' => 'Mage_Reports_Model_Resource_Shipping_Collection',
+    'Mage_Reports_Model_Mysql4_Shopcart_Product_Collection' => 'Mage_Reports_Model_Resource_Shopcart_Product_Collection',
+    'Mage_Reports_Model_Mysql4_Tag_Collection' => 'Mage_Reports_Model_Resource_Tag_Collection',
+    'Mage_Reports_Model_Mysql4_Tag_Customer_Collection' => 'Mage_Reports_Model_Resource_Tag_Customer_Collection',
+    'Mage_Reports_Model_Mysql4_Tag_Product_Collection' => 'Mage_Reports_Model_Resource_Tag_Product_Collection',
+    'Mage_Reports_Model_Mysql4_Tax_Collection' => 'Mage_Reports_Model_Resource_Tax_Collection',
+    'Mage_Reports_Model_Mysql4_Wishlist_Collection' => 'Mage_Reports_Model_Resource_Wishlist_Collection',
+    'Mage_Reports_Model_Mysql4_Wishlist_Product_Collection' => 'Mage_Reports_Model_Resource_Wishlist_Product_Collection',
+    'Mage_Review_Model_Mysql4_Review' => 'Mage_Review_Model_Resource_Review',
+    'Mage_Review_Model_Mysql4_Review_Collection' => 'Mage_Review_Model_Resource_Review_Collection',
+    'Mage_Review_Model_Mysql4_Review_Product_Collection' => 'Mage_Review_Model_Resource_Review_Product_Collection',
+    'Mage_Review_Model_Mysql4_Review_Status_Collection' => 'Mage_Review_Model_Resource_Review_Status_Collection',
+    'Mage_Review_Model_Mysql4_Review_Summary' => 'Mage_Review_Model_Resource_Review_Summary',
+    'Mage_Review_Model_Mysql4_Review_Summary_Collection' => 'Mage_Review_Model_Resource_Review_Summary_Collection',
+    'Mage_Rss_Model_Mysql4_Order' => 'Mage_Rss_Model_Resource_Order',
+    'Mage_Rule_Model_Mysql4_Rule' => 'Mage_Rule_Model_Resource_Rule',
+    'Mage_Rule_Model_Mysql4_Rule_Collection' => 'Mage_Rule_Model_Resource_Rule_Collection',
+    'Mage_Sales_Model_Mysql4_Abstract' => 'Mage_Sales_Model_Resource_Abstract',
+    'Mage_Sales_Model_Mysql4_Billing_Agreement' => 'Mage_Sales_Model_Resource_Billing_Agreement',
+    'Mage_Sales_Model_Mysql4_Billing_Agreement_Collection' => 'Mage_Sales_Model_Resource_Billing_Agreement_Collection',
+    'Mage_Sales_Model_Mysql4_Collection_Abstract' => 'Mage_Sales_Model_Resource_Collection_Abstract',
+    'Mage_Sales_Model_Mysql4_Order' => 'Mage_Sales_Model_Resource_Order',
+    'Mage_Sales_Model_Mysql4_Order_Abstract' => 'Mage_Sales_Model_Resource_Order_Abstract',
+    'Mage_Sales_Model_Mysql4_Order_Address' => 'Mage_Sales_Model_Resource_Order_Address',
+    'Mage_Sales_Model_Mysql4_Order_Address_Collection' => 'Mage_Sales_Model_Resource_Order_Address_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Billing' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing',
+    'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Child',
+    'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent',
+    'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Shipping' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping',
+    'Mage_Sales_Model_Mysql4_Order_Collection' => 'Mage_Sales_Model_Resource_Order_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Collection_Abstract' => 'Mage_Sales_Model_Resource_Order_Collection_Abstract',
+    'Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract' => 'Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo' => 'Mage_Sales_Model_Resource_Order_Creditmemo',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Comment',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Item' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Item',
+    'Mage_Sales_Model_Mysql4_Order_Creditmemo_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Grid_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Invoice' => 'Mage_Sales_Model_Resource_Order_Invoice',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Item' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Order' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Comment' => 'Mage_Sales_Model_Resource_Order_Invoice_Comment',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Comment_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Item' => 'Mage_Sales_Model_Resource_Order_Invoice_Item',
+    'Mage_Sales_Model_Mysql4_Order_Invoice_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Item_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Item' => 'Mage_Sales_Model_Resource_Order_Item',
+    'Mage_Sales_Model_Mysql4_Order_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Item_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Payment' => 'Mage_Sales_Model_Resource_Order_Payment',
+    'Mage_Sales_Model_Mysql4_Order_Payment_Collection' => 'Mage_Sales_Model_Resource_Order_Payment_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Payment_Transaction' => 'Mage_Sales_Model_Resource_Order_Payment_Transaction',
+    'Mage_Sales_Model_Mysql4_Order_Payment_Transaction_Collection' => 'Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Shipment' => 'Mage_Sales_Model_Resource_Order_Shipment',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Comment' => 'Mage_Sales_Model_Resource_Order_Shipment_Comment',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Comment_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Item' => 'Mage_Sales_Model_Resource_Order_Shipment_Item',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Item_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Track' => 'Mage_Sales_Model_Resource_Order_Shipment_Track',
+    'Mage_Sales_Model_Mysql4_Order_Shipment_Track_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Track_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Status' => 'Mage_Sales_Model_Resource_Order_Status',
+    'Mage_Sales_Model_Mysql4_Order_Status_Collection' => 'Mage_Sales_Model_Resource_Order_Status_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Status_History' => 'Mage_Sales_Model_Resource_Order_Status_History',
+    'Mage_Sales_Model_Mysql4_Order_Status_History_Collection' => 'Mage_Sales_Model_Resource_Order_Status_History_Collection',
+    'Mage_Sales_Model_Mysql4_Order_Tax' => 'Mage_Sales_Model_Resource_Order_Tax',
+    'Mage_Sales_Model_Mysql4_Order_Tax_Collection' => 'Mage_Sales_Model_Resource_Order_Tax_Collection',
+    'Mage_Sales_Model_Mysql4_Quote' => 'Mage_Sales_Model_Resource_Quote',
+    'Mage_Sales_Model_Mysql4_Quote_Address' => 'Mage_Sales_Model_Resource_Quote_Address',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Region' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Custbalance' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Discount' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Grand' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Shipping' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Subtotal' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Tax' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Collection' => 'Mage_Sales_Model_Resource_Quote_Address_Collection',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Item' => 'Mage_Sales_Model_Resource_Quote_Address_Item',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Item_Collection' => 'Mage_Sales_Model_Resource_Quote_Address_Item_Collection',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Rate' => 'Mage_Sales_Model_Resource_Quote_Address_Rate',
+    'Mage_Sales_Model_Mysql4_Quote_Address_Rate_Collection' => 'Mage_Sales_Model_Resource_Quote_Address_Rate_Collection',
+    'Mage_Sales_Model_Mysql4_Quote_Collection' => 'Mage_Sales_Model_Resource_Quote_Collection',
+    'Mage_Sales_Model_Mysql4_Quote_Item' => 'Mage_Sales_Model_Resource_Quote_Item',
+    'Mage_Sales_Model_Mysql4_Quote_Item_Collection' => 'Mage_Sales_Model_Resource_Quote_Item_Collection',
+    'Mage_Sales_Model_Mysql4_Quote_Item_Option' => 'Mage_Sales_Model_Resource_Quote_Item_Option',
+    'Mage_Sales_Model_Mysql4_Quote_Item_Option_Collection' => 'Mage_Sales_Model_Resource_Quote_Item_Option_Collection',
+    'Mage_Sales_Model_Mysql4_Quote_Payment' => 'Mage_Sales_Model_Resource_Quote_Payment',
+    'Mage_Sales_Model_Mysql4_Quote_Payment_Collection' => 'Mage_Sales_Model_Resource_Quote_Payment_Collection',
+    'Mage_Sales_Model_Mysql4_Recurring_Profile' => 'Mage_Sales_Model_Resource_Recurring_Profile',
+    'Mage_Sales_Model_Mysql4_Recurring_Profile_Collection' => 'Mage_Sales_Model_Resource_Recurring_Profile_Collection',
+    'Mage_Sales_Model_Mysql4_Report' => 'Mage_Sales_Model_Resource_Report',
+    'Mage_Sales_Model_Mysql4_Report_Abstract' => 'Mage_Sales_Model_Resource_Report_Abstract',
+    'Mage_Sales_Model_Mysql4_Report_Bestsellers' => 'Mage_Sales_Model_Resource_Report_Bestsellers',
+    'Mage_Sales_Model_Mysql4_Report_Bestsellers_Collection' => 'Mage_Sales_Model_Resource_Report_Bestsellers_Collection',
+    'Mage_Sales_Model_Mysql4_Report_Collection_Abstract' => 'Mage_Sales_Model_Resource_Report_Collection_Abstract',
+    'Mage_Sales_Model_Mysql4_Report_Invoiced' => 'Mage_Sales_Model_Resource_Report_Invoiced',
+    'Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Invoiced' => 'Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced',
+    'Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Order' => 'Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order',
+    'Mage_Sales_Model_Mysql4_Report_Order' => 'Mage_Sales_Model_Resource_Report_Order',
+    'Mage_Sales_Model_Mysql4_Report_Order_Collection' => 'Mage_Sales_Model_Resource_Report_Order_Collection',
+    'Mage_Sales_Model_Mysql4_Report_Order_Updatedat_Collection' => 'Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection',
+    'Mage_Sales_Model_Mysql4_Report_Refunded' => 'Mage_Sales_Model_Resource_Report_Refunded',
+    'Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Order' => 'Mage_Sales_Model_Resource_Report_Refunded_Collection_Order',
+    'Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Refunded' => 'Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded',
+    'Mage_Sales_Model_Mysql4_Report_Shipping' => 'Mage_Sales_Model_Resource_Report_Shipping',
+    'Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Order' => 'Mage_Sales_Model_Resource_Report_Shipping_Collection_Order',
+    'Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Shipment' => 'Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment',
+    'Mage_Sales_Model_Mysql4_Sale_Collection' => 'Mage_Sales_Model_Resource_Sale_Collection',
+    'Mage_Sales_Model_Mysql4_Setup' => 'Mage_Sales_Model_Resource_Setup',
+    'Mage_SalesRule_Model_Mysql4_Coupon' => 'Mage_SalesRule_Model_Resource_Coupon',
+    'Mage_SalesRule_Model_Mysql4_Coupon_Collection' => 'Mage_SalesRule_Model_Resource_Coupon_Collection',
+    'Mage_SalesRule_Model_Mysql4_Coupon_Usage' => 'Mage_SalesRule_Model_Resource_Coupon_Usage',
+    'Mage_SalesRule_Model_Mysql4_Report_Collection' => 'Mage_SalesRule_Model_Resource_Report_Collection',
+    'Mage_SalesRule_Model_Mysql4_Report_Rule' => 'Mage_SalesRule_Model_Resource_Report_Rule',
+    'Mage_SalesRule_Model_Mysql4_Report_Updatedat_Collection' => 'Mage_SalesRule_Model_Resource_Report_Updatedat_Collection',
+    'Mage_SalesRule_Model_Mysql4_Rule' => 'Mage_SalesRule_Model_Resource_Rule',
+    'Mage_SalesRule_Model_Mysql4_Rule_Collection' => 'Mage_SalesRule_Model_Resource_Rule_Collection',
+    'Mage_SalesRule_Model_Mysql4_Rule_Customer' => 'Mage_SalesRule_Model_Resource_Rule_Customer',
+    'Mage_SalesRule_Model_Mysql4_Rule_Customer_Collection' => 'Mage_SalesRule_Model_Resource_Rule_Customer_Collection',
+    'Mage_SalesRule_Model_Mysql4_Rule_Product' => 'Mage_SalesRule_Model_Resource_Rule_Product',
+    'Mage_SalesRule_Model_Mysql4_Rule_Product_Collection' => 'Mage_SalesRule_Model_Resource_Rule_Product_Collection',
+    'Mage_Sendfriend_Model_Mysql4_Sendfriend' => 'Mage_Sendfriend_Model_Resource_Sendfriend',
+    'Mage_Sendfriend_Model_Mysql4_Sendfriend_Collection' => 'Mage_Sendfriend_Model_Resource_Sendfriend_Collection',
+    'Mage_Sendfriend_Model_Mysql4_Setup' => 'Mage_Sendfriend_Model_Resource_Setup',
+    'Mage_Shipping_Model_Mysql4_Carrier_Tablerate' => 'Mage_Shipping_Model_Resource_Carrier_Tablerate',
+    'Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection' => 'Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection',
+    'Mage_Sitemap_Model_Mysql4_Catalog_Category' => 'Mage_Sitemap_Model_Resource_Catalog_Category',
+    'Mage_Sitemap_Model_Mysql4_Catalog_Product' => 'Mage_Sitemap_Model_Resource_Catalog_Product',
+    'Mage_Sitemap_Model_Mysql4_Cms_Page' => 'Mage_Sitemap_Model_Resource_Cms_Page',
+    'Mage_Sitemap_Model_Mysql4_Sitemap' => 'Mage_Sitemap_Model_Resource_Sitemap',
+    'Mage_Sitemap_Model_Mysql4_Sitemap_Collection' => 'Mage_Sitemap_Model_Resource_Sitemap_Collection',
+    'Mage_Tag_Model_Mysql4_Customer_Collection' => 'Mage_Tag_Model_Resource_Customer_Collection',
+    'Mage_Tag_Model_Mysql4_Indexer_Summary' => 'Mage_Tag_Model_Resource_Indexer_Summary',
+    'Mage_Tag_Model_Mysql4_Popular_Collection' => 'Mage_Tag_Model_Resource_Popular_Collection',
+    'Mage_Tag_Model_Mysql4_Product_Collection' => 'Mage_Tag_Model_Resource_Product_Collection',
+    'Mage_Tag_Model_Mysql4_Tag' => 'Mage_Tag_Model_Resource_Tag',
+    'Mage_Tag_Model_Mysql4_Tag_Collection' => 'Mage_Tag_Model_Resource_Tag_Collection',
+    'Mage_Tag_Model_Mysql4_Tag_Relation' => 'Mage_Tag_Model_Resource_Tag_Relation',
+    'Mage_Tax_Model_Mysql4_Calculation' => 'Mage_Tax_Model_Resource_Calculation',
+    'Mage_Tax_Model_Mysql4_Calculation_Collection' => 'Mage_Tax_Model_Resource_Calculation_Collection',
+    'Mage_Tax_Model_Mysql4_Calculation_Rate' => 'Mage_Tax_Model_Resource_Calculation_Rate',
+    'Mage_Tax_Model_Mysql4_Calculation_Rate_Collection' => 'Mage_Tax_Model_Resource_Calculation_Rate_Collection',
+    'Mage_Tax_Model_Mysql4_Calculation_Rate_Title' => 'Mage_Tax_Model_Resource_Calculation_Rate_Title',
+    'Mage_Tax_Model_Mysql4_Calculation_Rate_Title_Collection' => 'Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection',
+    'Mage_Tax_Model_Mysql4_Calculation_Rule' => 'Mage_Tax_Model_Resource_Calculation_Rule',
+    'Mage_Tax_Model_Mysql4_Calculation_Rule_Collection' => 'Mage_Tax_Model_Resource_Calculation_Rule_Collection',
+    'Mage_Tax_Model_Mysql4_Class' => 'Mage_Tax_Model_Resource_Class',
+    'Mage_Tax_Model_Mysql4_Class_Collection' => 'Mage_Tax_Model_Resource_Class_Collection',
+    'Mage_Tax_Model_Mysql4_Report_Collection' => 'Mage_Tax_Model_Resource_Report_Collection',
+    'Mage_Tax_Model_Mysql4_Report_Tax' => 'Mage_Tax_Model_Resource_Report_Tax',
+    'Mage_Tax_Model_Mysql4_Report_Updatedat_Collection' => 'Mage_Tax_Model_Resource_Report_Updatedat_Collection',
+    'Mage_Tax_Model_Mysql4_Sales_Order_Tax' => 'Mage_Tax_Model_Resource_Sales_Order_Tax',
+    'Mage_Tax_Model_Mysql4_Sales_Order_Tax_Collection' => 'Mage_Tax_Model_Resource_Sales_Order_Tax_Collection',
+    'Mage_Tax_Model_Mysql4_Setup' => 'Mage_Tax_Model_Resource_Setup',
+    'Mage_Weee_Model_Mysql4_Attribute_Backend_Weee_Tax' => 'Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax',
+    'Mage_Weee_Model_Mysql4_Setup' => 'Mage_Weee_Model_Resource_Setup',
+    'Mage_Weee_Model_Mysql4_Tax' => 'Mage_Weee_Model_Resource_Tax',
+    'Mage_Widget_Model_Mysql4_Widget' => 'Mage_Widget_Model_Resource_Widget',
+    'Mage_Widget_Model_Mysql4_Widget_Instance' => 'Mage_Widget_Model_Resource_Widget_Instance',
+    'Mage_Widget_Model_Mysql4_Widget_Instance_Collection' => 'Mage_Widget_Model_Resource_Widget_Instance_Collection',
+    'Mage_Wishlist_Model_Mysql4_Item' => 'Mage_Wishlist_Model_Resource_Item',
+    'Mage_Wishlist_Model_Mysql4_Item_Collection' => 'Mage_Wishlist_Model_Resource_Item_Collection',
+    'Mage_Wishlist_Model_Mysql4_Item_Option' => 'Mage_Wishlist_Model_Resource_Item_Option',
+    'Mage_Wishlist_Model_Mysql4_Item_Option_Collection' => 'Mage_Wishlist_Model_Resource_Item_Option_Collection',
+    'Mage_Wishlist_Model_Mysql4_Product_Collection' => 'Mage_Wishlist_Model_Resource_Product_Collection',
+    'Mage_Wishlist_Model_Mysql4_Wishlist' => 'Mage_Wishlist_Model_Resource_Wishlist',
+    'Mage_Wishlist_Model_Mysql4_Wishlist_Collection' => 'Mage_Wishlist_Model_Resource_Wishlist_Collection',
+    'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Interface' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface',
+    'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Interface' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Interface',
+
+    '<admin_mysql4>' => '<admin_resource>',
+    '<adminnotification_mysql4>' => '<adminnotification_resource>',
+    '<adminhtml_mysql4>' => '<adminhtml_resource>',
+    '<api_mysql4>' => '<api_resource>',
+    '<backup_mysql4>' => '<backup_resource>',
+    '<bundle_mysql4>' => '<bundle_resource>',
+    '<catalog_resource_eav_mysql4>' => '<catalog_resource>',
+    '<catalogindex_mysql4>' => '<catalogindex_resource>',
+    '<cataloginventory_mysql4>' => '<cataloginventory_resource>',
+    '<catalogrule_mysql4>' => '<catalogrule_resource>',
+    '<catalogsearch_mysql4>' => '<catalogsearch_resource>',
+    '<checkout_mysql4>' => '<checkout_resource>',
+    '<cms_mysql4>' => '<cms_resource>',
+    '<cron_mysql4>' => '<cron_resource>',
+    '<customer_mysql4>' => '<customer_resource>',
+    '<dataflow_mysql4>' => '<dataflow_resource>',
+    '<directory_mysql4>' => '<directory_resource>',
+    '<downloadable_mysql4>' => '<downloadable_resource>',
+    '<eav_mysql4>' => '<eav_resource>',
+    '<giftmessage_mysql4>' => '<giftmessage_resource>',
+    '<index_mysql4>' => '<index_resource>',
+    '<install_mysql4>' => '<install_resource>',
+    '<log_mysql4>' => '<log_resource>',
+    '<media_file>' => '<media_resource>',
+    '<newsletter_mysql4>' => '<newsletter_resource>',
+    '<paygate_mysql4>' => '<paygate_resource>',
+    '<paypal_mysql4>' => '<paypal_resource>',
+    '<paypaluk_mysql4>' => '<paypaluk_resource>',
+    '<poll_mysql4>' => '<poll_resource>',
+    '<productalert_mysql4>' => '<productalert_resource>',
+    '<rating_mysql4>' => '<rating_resource>',
+    '<reports_mysql4>' => '<reports_resource>',
+    '<review_mysql4>' => '<review_resource>',
+    '<rss_mysql4>' => '<rss_resource>',
+    '<rule_mysql4>' => '<rule_resource>',
+    '<sales_mysql4>' => '<sales_resource>',
+    '<salesrule_mysql4>' => '<salesrule_resource>',
+    '<sendfriend_mysql4>' => '<sendfriend_resource>',
+    '<shipping_mysql4>' => '<shipping_resource>',
+    '<sitemap_mysql4>' => '<sitemap_resource>',
+    '<tag_mysql4>' => '<tag_resource>',
+    '<tax_mysql4>' => '<tax_resource>',
+    '<weee_mysql4>' => '<weee_resource>',
+    '<widget_mysql4>' => '<widget_resource>',
+    '<wishlist_mysql4>' => '<wishlist_resource>',
+    '<core_mysql4>' => '<core_resource>',
+];
+
+foreach ($todo as $search => $replace) {
+    echo $search,"\n";
+
+    $files = [];
+    exec('grep -Hlrn "'.$search.'" app/', $files);
+
+    if ($search[0] == '<') {
+        foreach ($files as $file) {
+            echo '  ',$file,"\n";
+            file_put_contents($file, preg_replace('#[[:<:]]'.$search.'[[:>:]]#', $replace, file_get_contents($file)));
+            file_put_contents($file, preg_replace('#[[:<:]]'.str_replace('<', '</', $search).'[[:>:]]#', str_replace('<', '</', $replace), file_get_contents($file)));
+        }
+    } else {
+        foreach ($files as $file) {
+            if (stripos($file, 'code/core') !== false) {
+                continue;
+            }
+            echo '  ',$file,"\n";
+            file_put_contents($file, preg_replace('#[[:<:]]'.$search.'[[:>:]]#', $replace, file_get_contents($file)));
+        }
+    }
+}
diff --git a/skin/adminhtml/default/default/menu.css b/skin/adminhtml/default/default/menu.css
index d6a3f985003..ab3e3eaf0f5 100644
--- a/skin/adminhtml/default/default/menu.css
+++ b/skin/adminhtml/default/default/menu.css
@@ -18,7 +18,7 @@
 
 /************** ALL LEVELS  *************/ /* Style consistent throughout all nav levels */
 #nav li { position:relative; text-align:left; }
-#nav li.over { z-index:999; }
+#nav li:hover { z-index:999; }
 #nav li.active { z-index:1000; } /* to prevent the li separator from showing through on mouseover on li */
 #nav a,
 #nav a:hover { display:block; text-decoration:none; }
@@ -31,7 +31,7 @@
 #nav li.active { margin-left:-1px; background:url(images/nav1_active.gif) no-repeat; color:#fff; font-weight:bold;  }
 #nav li.active em { display:block; position:absolute; top:0; right:-1px; width:3px; height:27px; background:url(images/nav1_active.gif) no-repeat 100% 0; }
 #nav a { float:left; padding:0 14px; color:#fff; line-height:27px; }
-#nav li.over a { color:#d6e2e5; }
+#nav li:hover a { color:#d6e2e5; }
 
 
 /************ 1ST LEVEL RESET ************/
@@ -39,8 +39,8 @@
 #nav ul li.active { float:none; height:auto; background:none; margin:0; }
 #nav ul a,
 #nav ul a:hover { float:none; padding:0; line-height:1.3em; }
-#nav ul li.over a,
-#nav ul li.over a:hover,
+#nav ul li:hover a,
+#nav ul li:hover a:hover,
 #nav ul a,
 #nav li.active li { font-weight:normal; }
 
@@ -50,17 +50,18 @@
 #nav ul ul  { border-top:0; background:url(images/nav3_bg.png) 0 0 no-repeat; padding-top:2px; left:100px; top:13px; }
 
 /* Show menu */
-#nav li.over ul { left:-1px; }
-#nav li.over ul ul { left:-10000px; }
-#nav li.over ul li.over ul { left:100px; }
+#nav li:hover ul { left:-1px; }
+#nav li:hover ul ul { left:-10000px; }
+#nav li:hover ul li:hover ul { left:100px; }
 
 #nav ul li { background:url(images/nav2_li_bg.png) repeat-y; padding:0 2px; }
 #nav ul li a { background:#e3ecee; }
 #nav ul li a:hover { background:#d0dfe2; }
-#nav li.over ul a,
+#nav li:hover ul a,
 #nav ul li.active a,
 #nav ul li a,
 #nav ul li a:hover { color:#2f2f2f; }
+#nav ul li a.active { text-decoration:underline; }
 #nav ul span,
 #nav ul li.last li span { padding:5px 15px; background:url(images/nav2_link_bg.gif) repeat-x 0 100%; }
 #nav ul li.last span,
@@ -84,7 +85,7 @@
 
 /* Show menu */
 #nav ul ul ul { left:-10000px; }
-#nav li.over ul li.over ul ul { left:-10000px;}
-#nav li.over ul li.over ul li.over ul { left:100px; }
+#nav li:hover ul li:hover ul ul { left:-10000px;}
+#nav li:hover ul li:hover ul li:hover ul { left:100px; }
 
 .nav-bar:after { content:"."; display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden;  }
diff --git a/skin/adminhtml/default/openmage/menu.css b/skin/adminhtml/default/openmage/menu.css
index 1bf1e0599d4..e92eadf9812 100644
--- a/skin/adminhtml/default/openmage/menu.css
+++ b/skin/adminhtml/default/openmage/menu.css
@@ -11,7 +11,7 @@
  240 = blue,
  300 = purple
 */
-#nav ul li, #nav ul li.active {
+#nav ul li.active, #nav ul li {
   float: none;
   height: auto;
   background: none;
@@ -47,29 +47,29 @@
   text-align: left;
   float: left;
 }
-#nav li.over {
+#nav li:hover {
   z-index: 999;
 }
-#nav li.over a {
+#nav li:hover a {
   color: #d6e2e5;
 }
-#nav li.over ul {
+#nav li:hover ul {
   left: 0;
 }
-#nav li.over ul ul {
+#nav li:hover ul ul {
   left: -10000px;
 }
-#nav li.over ul a {
+#nav li:hover ul a {
   color: #202856;
   font-size: 12px;
 }
-#nav li.over ul li.over ul {
+#nav li:hover ul li:hover ul {
   left: 100px;
 }
-#nav li.over ul li.over ul ul {
+#nav li:hover ul li:hover ul ul {
   left: -10000px;
 }
-#nav li.over ul li.over ul li.over ul {
+#nav li:hover ul li:hover ul li:hover ul {
   left: 100px;
 }
 #nav li.active {
@@ -111,7 +111,7 @@
   border-width: 5px 0 5px 6px;
   border-color: transparent transparent transparent #c8c8c8;
 }
-#nav li.level0.over > a {
+#nav li.level0:hover > a {
   background: #293470;
   color: #fff;
 }
@@ -158,7 +158,7 @@
   width: 189px;
   top: 38px;
   left: -10000px;
-  box-shadow: rgba(0, 0, 0, 0.18039) 1px 3px 4px;
+  box-shadow: rgba(0, 0, 0, 0.180392) 1px 3px 4px;
 }
 #nav ul li {
   padding: 0;
@@ -173,6 +173,9 @@
   color: #202856;
   font-size: 12px;
 }
+#nav ul li a.active {
+  text-decoration: underline;
+}
 #nav ul li a:hover {
   background: #202856;
   color: #fff;
@@ -191,10 +194,10 @@
 #nav ul li.parent li a {
   background-image: none;
 }
-#nav ul li.over a {
+#nav ul li:hover a {
   font-weight: normal;
 }
-#nav ul li.over a:hover {
+#nav ul li:hover a:hover {
   font-weight: normal;
 }
 #nav ul a {
@@ -238,7 +241,7 @@
   top: 40px;
   right: -10000px;
   display: none;
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.20784), 0 0 5px rgba(0, 0, 0, 0.20784);
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.207843), 0 0 5px rgba(0, 0, 0, 0.207843);
   background: #fff;
 }
 #usermenu ul li a:hover {
@@ -252,19 +255,19 @@
   display: block;
 }
 #usermenu li ul span {
-  border-bottom: 1px dotted #a6c4d9;
+  border-bottom: 1px dotted hsl(205, 40%, 75%);
   display: block;
   line-height: 31px;
   padding: 0 10px;
 }
-#usermenu li.over ul {
+#usermenu li:hover ul {
   right: 27px;
   display: block;
 }
-#usermenu li.over ul a {
+#usermenu li:hover ul a {
   color: #000537;
   text-decoration: none;
-  background: #ecf3f9;
+  background: hsl(205, 52%, 95%);
   display: block;
 }
 #usermenu > li > a {
diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/default/openmage/menu.css.map
index 93e3112ef89..7de39bad9ba 100644
--- a/skin/adminhtml/default/openmage/menu.css.map
+++ b/skin/adminhtml/default/openmage/menu.css.map
@@ -1,7 +1 @@
-{
-"version": 3,
-"mappings": "AAAA;;;GAGG;AC4FH;;;;;;;;EAQE;ACgEF,6BAAW;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,CAAC;;;AAwIX,uBAAW;EACT,KAAK,ED5PW,OAAO;EC6PvB,eAAe,EAAE,IAAI;EACrB,UAAU,EAAE,oBAAoB;EAChC,OAAO,EAAE,KAAK;;;AFhThB,QAAS;EACP,UAAU,ECPS,OAAO;EDQ1B,OAAO,EAAE,cAAc;;AAEvB,cAAQ;EACN,OAAO,EAAE,GAAG;EACZ,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,CAAC;EACZ,WAAW,EAAE,CAAC;EACd,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,MAAM;;;AAIpB,IAAK;EACH,YAAY,EAAC,CAAC;;AACd,OAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;;AAEX,YAAO;EACL,OAAO,EAAE,GAAG;;AAEZ,cAAE;EACA,KAAK,ECGS,OAAO;;ADAvB,eAAG;EACD,IAAI,EAAE,CAAC;;AAEP,kBAAG;EACD,IAAI,EAAE,QAAQ;;AAGhB,iBAAE;EACA,KAAK,ECTO,OAA8B;EDU1C,SAAS,EAAE,IAAI;;AAGjB,0BAAW;EACT,IAAI,EAAE,KAAK;;AAEX,6BAAG;EACD,IAAI,EAAE,QAAQ;;AAGhB,qCAAW;EACT,IAAI,EAAE,KAAK;;AAMnB,cAAS;EACP,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,IAAI;EACjB,KAAK,ECeH,IAAI;EDdN,WAAW,EAAE,IAAI;;AAEjB,iBAAG;EACD,OAAO,EAAE,KAAK;EACd,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;;AAGd,iBAAG;EACD,WAAW,EAAE,MAAM;;AAKrB,kBAAI;EACF,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,GAAG;EAChB,KAAK,ECNL,IAAI;EDOJ,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,IAAI;;AAEjB,wBAAQ;EACN,UAAU,EAAE,OAA8B;EAC1C,KAAK,ECZP,IAAI;;ADgBN,kCAAoB;EAClB,OAAO,EAAE,EAAE;EACX,QAAQ,EAAE,QAAQ;EAClB,KAAK,ECvCI,IAAI;EDwCb,MAAM,ECzCG,GAAG;ED0CZ,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,YAAY,EAAE,KAAK;EACnB,YAAY,EAAE,aAAa;EAC3B,YAAY,EAAE,2CAAwD;;AAGxE,uBAAW;EACT,UAAU,EAAE,OAA8B;EAC1C,KAAK,EC9BL,IAAI;;ADmCN,gBAAE;EACA,MAAM,EAAE,OAAO;;AAKb,0BAAE;EACA,MAAM,EAAE,OAAO;;AAKb,oCAAE;EACA,MAAM,EAAE,OAAO;;AAGjB,uCAAK;EACH,MAAM,EAAE,OAAO;;AAInB,6BAAE;EACA,MAAM,EAAE,OAAO;;AAKrB,mBAAE;EACA,MAAM,EAAE,OAAO;;AAMnB,+BAAE;EACA,mBAAmB,EAAE,UAAU;EAC/B,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,kCAAO;EACL,mBAAmB,EAAE,YAAY;;AAKvC,MAAE;EACA,OAAO,EAAE,KAAK;EACd,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,MAAM;EACf,KAAK,ECtFD,IAAI;EDuFR,MAAM,EAAE,OAAO;;AAEf,YAAQ;EACN,OAAO,EAAE,KAAK;EACd,eAAe,EAAE,IAAI;;AAIzB,OAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,QAAQ;EAEd,UAAU,EAAE,kCAA0B;;AAEtC,UAAG;EAED,OAAO,EAAE,CAAC;;AAKR,mBAAE;EACA,KAAK,EC5JO,OAA8B;ED6J1C,SAAS,EAAE,IAAI;;AAInB,YAAE;EACA,UAAU,ECrHV,IAAI;EDsHJ,OAAO,EAAE,QAA+B;EACxC,KAAK,ECpKS,OAA8B;EDqK5C,SAAS,EAAE,IAAI;;AAEf,kBAAQ;EACN,UAAU,ECxKE,OAA8B;EDyK1C,KAAK,EC5HP,IAAI;;ADiIJ,mBAAE;EACA,mBAAmB,EAAE,SAAS;EAC9B,iBAAiB,EAAE,SAAS;;AAK1B,6BAAE;EACA,mBAAmB,EAAE,SAAS;EAC9B,iBAAiB,EAAE,SAAS;;AAG9B,gCAAK;EACH,gBAAgB,EAAE,IAAI;;AAI1B,sBAAE;EACA,gBAAgB,EAAE,IAAI;;AAK5B,iBAAS;EACP,WAAW,EAAE,MAAM;;AAEnB,uBAAQ;EACN,WAAW,EAAE,MAAM;;AAKzB,SAAE;EACA,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,KAAK;EAClB,WAAW,EAAE,MAAM;;AAEnB,eAAQ;EACN,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,KAAK;;AAItB,UAAG;EACD,UAAU,EAAE,CAAC;EACb,WAAW,EAAE,GAAG;EAChB,IAAI,EAAE,KAAK;EACX,GAAG,EAAE,IAAI;;AAET,aAAG;EACD,IAAI,EAAE,QAAQ;;AAMlB,sBAAU;EACR,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,GAAG;EACX,SAAS,EAAE,CAAC;;AAGd,uBAAa;EACX,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,OAA8B;;;AAKhD,SAAU;EACR,OAAO,EAAE,MAAM;EACf,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,IAAI;;AAChB,YAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,QAAQ;EACf,OAAO,EAAE,IAAI;EAEb,UAAU,EAAE,gEAAgD;EAC5D,UAAU,ECpNN,IAAI;;ADsNN,uBAAQ;EAEN,UAAU,ECrQI,OAA8B;;ADuQ9C,yBAAY;EACV,aAAa,EAAE,IAAI;;AAMrB,kBAAG;EACD,KAAK,EAAE,GAAG;EACV,OAAO,EAAE,KAAK;;AAEhB,oBAAK;EACH,aAAa,EAAE,kBAAwB;EACvC,OAAO,EAAE,KAAK;EACd,WAAW,EAAE,IAAI;EACjB,OAAO,EAAE,MAAM;;AAGnB,oBAAU;EACR,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,KAAK;;AACd,sBAAE;EACA,KAAK,EClTO,OAAO;EDmTnB,eAAe,EAAE,IAAI;EACrB,UAAU,ECzNF,OAAuB;ED0N/B,OAAO,EAAE,KAAK;;AAIpB,kBAAS;EACP,OAAO,EAAE,aAAa;EACtB,OAAO,EAAE,KAAK;;AACd,sBAAI;EACF,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI",
-"sources": ["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],
-"names": [],
-"file": "menu.css"
-}
+{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA;EACA,OCeE;EDdF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCNA;EDOA;EACA;;AAEA;EACE;EACA,OCZF;;ADgBF;EACE;EACA;EACA,OCvCS;EDwCT,QCzCS;ED0CT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC9BA;;ADmCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAMJ;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OCtFI;EDuFJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OC5JY;ED6JZ;;AAIJ;EACE,YCrHA;EDsHA;EACA,OCpKc;EDqKd;;AAEA;EACE;;AAEF;EACE,YC3KY;ED4KZ,OC/HF;;ADoIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YCvNI;;ADyNF;EAEE,YCxQc;;AD0QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCrTY;EDsTZ;EACA,YC5NQ;ED6NR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"}
\ No newline at end of file
diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/default/openmage/scss/menu.scss
index a27736d6898..8a95bc13740 100644
--- a/skin/adminhtml/default/openmage/scss/menu.scss
+++ b/skin/adminhtml/default/openmage/scss/menu.scss
@@ -27,7 +27,7 @@
     text-align: left;
     float: left;
 
-    &.over {
+    &:hover {
       z-index: 999;
 
       a {
@@ -46,14 +46,14 @@
           font-size: 12px;
         }
 
-        li.over ul {
+        li:hover ul {
           left: 100px;
 
           ul {
             left: -10000px;
           }
 
-          li.over ul {
+          li:hover ul {
             left: 100px;
           }
         }
@@ -106,7 +106,7 @@
         border-color: transparent transparent transparent $color_silver_approx;
       }
 
-      &.over > a {
+      &:hover > a {
         background: darken($openmage_base_blue,12);
         color: $white;
       }
@@ -200,6 +200,9 @@
         color: $color_dorado_approx;
         font-size: 12px;
 
+        &.active {
+          text-decoration: underline;
+        }
         &:hover {
           background: $color_dorado_approx;
           color: $white;
@@ -230,7 +233,7 @@
         }
       }
 
-      &.over a {
+      &:hover a {
         font-weight: normal;
 
         &:hover {
@@ -314,7 +317,7 @@
         padding: 0 10px;
       }
     }
-    &.over ul {
+    &:hover ul {
       right: 27px;
       display: block;
       a {
@@ -333,4 +336,4 @@
       width: auto;
     }
   }
-}
\ No newline at end of file
+}