diff --git a/CRM/Upgrade/Incremental/php/FiveEighteen.php b/CRM/Upgrade/Incremental/php/FiveEighteen.php
index 8cf31ff1f233..6428be7bec20 100644
--- a/CRM/Upgrade/Incremental/php/FiveEighteen.php
+++ b/CRM/Upgrade/Incremental/php/FiveEighteen.php
@@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_18_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
     $this->addTask('Update smart groups to reflect change of unique name for is_override', 'updateSmartGroups', [
       'renameField' => [
         ['old' => 'is_override', 'new' => 'member_is_override'],
diff --git a/CRM/Upgrade/Incremental/php/FiveEleven.php b/CRM/Upgrade/Incremental/php/FiveEleven.php
index feb11b4b7cd0..6ad79515b2eb 100644
--- a/CRM/Upgrade/Incremental/php/FiveEleven.php
+++ b/CRM/Upgrade/Incremental/php/FiveEleven.php
@@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_11_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Update smart groups where jcalendar fields have been converted to datepicker', 'updateSmartGroups', [
       'datepickerConversion' => [
         'grant_application_received_date',
@@ -78,6 +78,7 @@ public function upgrade_5_11_alpha1($rev) {
    * @param string $rev
    */
   public function upgrade_5_11_beta1($rev) {
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
       $this->addTask('Update any on hold groups to reflect field change', 'updateOnHold', $rev);
     }
diff --git a/CRM/Upgrade/Incremental/php/FiveFourteen.php b/CRM/Upgrade/Incremental/php/FiveFourteen.php
index 66468d761a48..49755d6d17dc 100644
--- a/CRM/Upgrade/Incremental/php/FiveFourteen.php
+++ b/CRM/Upgrade/Incremental/php/FiveFourteen.php
@@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_14_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
     // Additional tasks here...
     // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex.
     // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
diff --git a/CRM/Upgrade/Incremental/php/FiveNineteen.php b/CRM/Upgrade/Incremental/php/FiveNineteen.php
index 24136bf6dae0..5ebb867b5ebf 100644
--- a/CRM/Upgrade/Incremental/php/FiveNineteen.php
+++ b/CRM/Upgrade/Incremental/php/FiveNineteen.php
@@ -52,7 +52,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_19_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Add api4 menu', 'api4Menu');
     $this->addTask('Add is_active field to civicrm_status_pref', 'addColumn', 'civicrm_status_pref', 'is_active',
       "tinyint(4) DEFAULT '1' COMMENT 'Is this status check active'", FALSE, '5.19.0');
diff --git a/CRM/Upgrade/Incremental/php/FiveSeventeen.php b/CRM/Upgrade/Incremental/php/FiveSeventeen.php
index c999fe2c34f8..5f86560b0c49 100644
--- a/CRM/Upgrade/Incremental/php/FiveSeventeen.php
+++ b/CRM/Upgrade/Incremental/php/FiveSeventeen.php
@@ -96,6 +96,7 @@ public function upgrade_5_17_alpha1($rev) {
    * @param string $rev
    */
   public function upgrade_5_17_1($rev) {
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     // Need to do this again because the alpha1 version had a typo and so didn't do anything.
     $this->addTask(ts('Add pptx to accepted attachment file types'), 'updateFileTypes');
   }
diff --git a/CRM/Upgrade/Incremental/php/FiveSix.php b/CRM/Upgrade/Incremental/php/FiveSix.php
index 592fd7a05b44..ac31fa6728c6 100644
--- a/CRM/Upgrade/Incremental/php/FiveSix.php
+++ b/CRM/Upgrade/Incremental/php/FiveSix.php
@@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_6_beta2($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('dev/core#107 - Add Activity\'s default assignee options', 'addActivityDefaultAssigneeOptions');
   }
 
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 7a1f2d23a312..34da4fef69d0 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -73,7 +73,7 @@ public function upgrade_5_31_alpha1($rev) {
 
   public function upgrade_5_31_beta2($rev) {
     $this->addTask('Restore null-ity of "civicrm_group.title" field', 'groupTitleRestore');
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
   }
 
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtySix.php b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
index 89a65a6c779d..e4e0047328da 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtySix.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
@@ -67,7 +67,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_36_alpha1(string $rev): void {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
 
     $this->addTask('core-issue#2422 - Add created_id to civicrm_saved_search', 'addColumn',
       'civicrm_saved_search', 'created_id', "int(10) unsigned DEFAULT NULL COMMENT 'FK to contact table.'");
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyThree.php b/CRM/Upgrade/Incremental/php/FiveThirtyThree.php
index 8d67bd4c0ff5..391779d589ee 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyThree.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyThree.php
@@ -52,7 +52,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_33_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Add column civicrm_dashboard.directive', 'addColumn', 'civicrm_dashboard', 'directive', "varchar(255) COMMENT 'Element name of angular directive to invoke (lowercase hyphenated format)'");
   }
 
diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyFive.php b/CRM/Upgrade/Incremental/php/FiveTwentyFive.php
index e7f269ed06e9..0343d4faabeb 100644
--- a/CRM/Upgrade/Incremental/php/FiveTwentyFive.php
+++ b/CRM/Upgrade/Incremental/php/FiveTwentyFive.php
@@ -80,7 +80,7 @@ public function upgrade_5_25_alpha1($rev) {
   }
 
   public function upgrade_5_25_beta3($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Convert CiviContribute settings', 'updateContributeSettings');
   }
 
diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php
index 88d392c79137..6980067cb2e2 100644
--- a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php
+++ b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php
@@ -81,7 +81,7 @@ public function upgrade_5_29_alpha1($rev) {
    * @param string $rev
    */
   public function upgrade_5_29_beta1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Make label field non required on price field value', 'priceFieldValueLabelNonRequired');
   }
 
diff --git a/CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl
deleted file mode 100644
index b58251174b72..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.0.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.1.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.1.0.mysql.tpl
deleted file mode 100644
index 698102eb71ee..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.1.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.1.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.1.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.1.1.mysql.tpl
deleted file mode 100644
index bf05b22faa44..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.1.1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.1.1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl
deleted file mode 100644
index 38caa89e4018..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.1.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.1.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.1.beta1.mysql.tpl
deleted file mode 100644
index ad3b7a584d69..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.1.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.1.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl
deleted file mode 100644
index d89730e6190a..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.10.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl
deleted file mode 100644
index 05d43117673f..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.11.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl
deleted file mode 100644
index 26170aa4235a..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.11.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl
deleted file mode 100644
index a4a894ded5ae..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.11.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl
deleted file mode 100644
index ff319ed9f057..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.12.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl
deleted file mode 100644
index 8813e5af9b60..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.13.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl
deleted file mode 100644
index 051f6eac085d..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.14.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl
deleted file mode 100644
index e45ab2285dc4..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.15.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl
deleted file mode 100644
index e6d292051461..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.15.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl
deleted file mode 100644
index 22be6dcfb8bb..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.16.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl
deleted file mode 100644
index 00d208673b2c..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.17.1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl
deleted file mode 100644
index b40cdb2b9c9e..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.17.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl
deleted file mode 100644
index 34af8cc25266..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.18.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl
deleted file mode 100644
index 9db49d5112fa..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.18.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl
deleted file mode 100644
index 341608e6f1d3..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.18.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl
deleted file mode 100644
index 01c1f5b16748..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.19.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl
deleted file mode 100644
index e565ce5d78b3..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.19.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl
deleted file mode 100644
index afee41fbb1a2..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.2.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl
deleted file mode 100644
index 9050d97346ce..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.20.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl
deleted file mode 100644
index 74eeb66570ee..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.21.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl
deleted file mode 100644
index 1885f7e76cf9..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.22.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl
deleted file mode 100644
index dfa1f812b9e4..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.22.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl
deleted file mode 100644
index c31449ad8c53..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.23.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl
deleted file mode 100644
index 1bd826fd834b..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.24.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl
deleted file mode 100644
index 10ef3a0996d0..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl
deleted file mode 100644
index 45c756a3cfcc..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl
deleted file mode 100644
index 096e95735d87..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.beta2 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl
deleted file mode 100644
index 1d9fd478e2d5..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.beta3 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl
deleted file mode 100644
index 3d0a8706e13d..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.26.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl
deleted file mode 100644
index c8cf8211db50..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.28.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl
deleted file mode 100644
index 4b2bf5addbf3..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.29.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.3.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.3.beta1.mysql.tpl
deleted file mode 100644
index fad808ceef7c..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.3.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.3.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl
deleted file mode 100644
index 9c22ccacf110..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.30.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl
deleted file mode 100644
index c549cd347e3a..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.31.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl
deleted file mode 100644
index 33384db1727e..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.31.beta2 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl
deleted file mode 100644
index e2257e2b95a5..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.32.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl
deleted file mode 100644
index 483b660face5..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.33.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl
deleted file mode 100644
index 55a35a785427..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.33.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl
deleted file mode 100644
index 9e19f32e68bb..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.34.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl
deleted file mode 100644
index b68c9003fc8e..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.35.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl
deleted file mode 100644
index 50af2344a657..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.36.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl
deleted file mode 100644
index 1fa88eeb1ec7..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.36.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.4.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.4.beta1.mysql.tpl
deleted file mode 100644
index b486eda69d14..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.4.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.4.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.6.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.6.beta1.mysql.tpl
deleted file mode 100644
index 038f2d411c7f..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.6.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.6.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.6.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.6.beta2.mysql.tpl
deleted file mode 100644
index e3e109cf4702..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.6.beta2.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.6.beta2 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.7.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.7.0.mysql.tpl
deleted file mode 100644
index 55f4e8ca3523..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.7.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.7.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl
deleted file mode 100644
index 6b3368ced837..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.7.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.8.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.8.beta1.mysql.tpl
deleted file mode 100644
index 67d1006593fd..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.8.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.8.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.9.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.9.0.mysql.tpl
deleted file mode 100644
index c290852e8d3e..000000000000
--- a/CRM/Upgrade/Incremental/sql/5.9.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.9.0 during upgrade *}