diff --git a/changelog.md b/changelog.md
index aeef6e50..3c5e71b8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -207,7 +207,7 @@
 - Removed uneccesary inputs from admin settings
 - Checked overall module stability
 
-## [2.1.1]
+## [2.1.0]
 - BO : Redesigned back-office settings into a React single-page admin
 - BO : Conditionally show/hide Saferpay Fields settings based on account license
 - BO : Renamed the "Custom form" column in Payment methods to "Saferpay Fields"
diff --git a/saferpayofficial.php b/saferpayofficial.php
index 0f42bea0..e5e44717 100644
--- a/saferpayofficial.php
+++ b/saferpayofficial.php
@@ -67,7 +67,7 @@ public function __construct($name = null)
     {
         $this->name = 'saferpayofficial';
         $this->author = 'Invertus';
-        $this->version = '2.1.1';
+        $this->version = '2.1.0';
         $this->module_key = '3d3506c3e184a1fe63b936b82bda1bdf';
         $this->displayName = 'SaferpayOfficial';
         $this->description = 'Saferpay Payment module';
diff --git a/upgrade/install-2.1.0.php b/upgrade/install-2.1.0.php
index 58ae7e34..d38ba19b 100644
--- a/upgrade/install-2.1.0.php
+++ b/upgrade/install-2.1.0.php
@@ -27,8 +27,14 @@
 
 function upgrade_module_2_1_0()
 {
-    $tabId = Tab::getIdFromClassName('AdminSaferPayOfficialPayment');
-    if ($tabId) {
+    $removedTabs = ['AdminSaferPayOfficialPayment', 'AdminSaferPayOfficialFields'];
+
+    foreach ($removedTabs as $className) {
+        $tabId = Tab::getIdFromClassName($className);
+        if (!$tabId) {
+            continue;
+        }
+
         $tab = new Tab($tabId);
         $tab->delete();
     }
diff --git a/upgrade/install-2.1.1.php b/upgrade/install-2.1.1.php
deleted file mode 100644
index b7b39ae0..00000000
--- a/upgrade/install-2.1.1.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- */
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_2_1_1()
-{
-    $tabId = Tab::getIdFromClassName('AdminSaferPayOfficialFields');
-    if ($tabId) {
-        $tab = new Tab($tabId);
-        $tab->delete();
-    }
-
-    return true;
-}