diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
index f1663f0ea35..20fe9d0c85c 100644
--- a/.phpstan.dist.baseline.neon
+++ b/.phpstan.dist.baseline.neon
@@ -8124,54 +8124,6 @@ parameters:
 			count: 9
 			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml
 
-		-
-			message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
-
-		-
-			message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
-
-		-
-			message: '#^Call to protected method _getDefaultValues\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
-
-		-
-			message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 2
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
-
-		-
-			message: '#^Call to protected method _showSingle\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
-
-		-
-			message: '#^Call to protected method _getDefaultValues\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
-
-		-
-			message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 2
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
-
-		-
-			message: '#^Call to protected method _showSingle\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
-
 		-
 			message: '#^Unreachable statement \- code above always terminates\.$#'
 			identifier: deadCode.unreachable
@@ -8316,12 +8268,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/catalog/product/price.phtml
 
-		-
-			message: '#^Call to protected method _isSecure\(\) of class Mage_Core_Block_Abstract\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/product/view.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -8568,12 +8514,6 @@ parameters:
 			count: 10
 			path: app/design/frontend/base/default/template/checkout/multishipping/success.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 5
-			path: app/design/frontend/base/default/template/checkout/onepage/billing.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -8784,24 +8724,12 @@ parameters:
 			count: 13
 			path: app/design/frontend/base/default/template/customer/form/confirmation.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 3
-			path: app/design/frontend/base/default/template/customer/form/edit.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
 			count: 16
 			path: app/design/frontend/base/default/template/customer/form/newsletter.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 3
-			path: app/design/frontend/base/default/template/customer/form/register.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -8964,18 +8892,6 @@ parameters:
 			count: 145
 			path: app/design/frontend/base/default/template/giftmessage/inline.phtml
 
-		-
-			message: '#^Call to protected method _getEnhancedEcommerceDataForAnalytics4\(\) of class Mage_GoogleAnalytics_Block_Ga\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/googleanalytics/ga.phtml
-
-		-
-			message: '#^Call to protected method _getPageTrackingCode\(\) of class Mage_GoogleAnalytics_Block_Ga\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/base/default/template/googleanalytics/ga.phtml
-
 		-
 			message: '#^Variable \$crumbs might not be defined\.$#'
 			identifier: variable.undefined
@@ -9150,12 +9066,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/paypal/payment/redirect.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 4
-			path: app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -9168,12 +9078,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 3
-			path: app/design/frontend/base/default/template/persistent/customer/form/register.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -9462,24 +9366,6 @@ parameters:
 			count: 6
 			path: app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/availability.phtml
 
-		-
-			message: '#^Call to protected method _getDefaultValues\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
-
-		-
-			message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 2
-			path: app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
-
-		-
-			message: '#^Call to protected method _showSingle\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
-
 		-
 			message: '#^Cannot call method setFilter\(\) on class\-string\|object\.$#'
 			identifier: method.nonObject
@@ -9516,12 +9402,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/catalog/product/price.phtml
 
-		-
-			message: '#^Call to protected method _isSecure\(\) of class Mage_Core_Block_Abstract\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/frontend/rwd/default/template/catalog/product/view.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -9726,12 +9606,6 @@ parameters:
 			count: 13
 			path: app/design/frontend/rwd/default/template/customer/form/confirmation.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 3
-			path: app/design/frontend/rwd/default/template/customer/form/edit.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -9858,12 +9732,6 @@ parameters:
 			count: 70
 			path: app/design/frontend/rwd/default/template/paypal/express/review/address.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 4
-			path: app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -9876,12 +9744,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 3
-			path: app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined