diff --git a/workflow/engine/classes/class.Installer.php b/workflow/engine/classes/class.Installer.php
index f28892519..129cfb047 100755
--- a/workflow/engine/classes/class.Installer.php
+++ b/workflow/engine/classes/class.Installer.php
@@ -234,16 +234,8 @@ class Installer
             $this->setPartner();
             $this->setAdmin();
 
-            /*----------------------------------********---------------------------------*/
-            if (true) {
-                //
-            } else {
-            /*----------------------------------********---------------------------------*/
-                $querySql = ("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
-                $this->run_query($querySql);
-            /*----------------------------------********---------------------------------*/
-            }
-            /*----------------------------------********---------------------------------*/
+            $querySql = ("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
+            $this->run_query($querySql);
         }
         return $test;
     }
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 9805a61b9..f204be2ff 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -796,20 +796,14 @@ class workspaceTools
 
                 $arrayData = $emailSever->create($arrayData);
             } else {
-                /*----------------------------------********---------------------------------*/
-                if (!PMLicensedFeatures::getSingleton()->verifyfeature("zIKRGpDM3pjcHFsWGplNDN0dTl5bGN3UTNiOWdQU0E5Q05QTksrU1ladWQ0VT0=")) {
-                /*----------------------------------********---------------------------------*/
-                    $arrayData["MESS_ENGINE"]   = "MAIL";
-                    $arrayData["MESS_SERVER"]   = "";
-                    $arrayData["MESS_ACCOUNT"]  = "";
-                    $arrayData["MESS_PASSWORD"] = "";
-                    $arrayData["MAIL_TO"]       = "";
-                    $arrayData["MESS_DEFAULT"]  = 1;
+                $arrayData["MESS_ENGINE"]   = "MAIL";
+                $arrayData["MESS_SERVER"]   = "";
+                $arrayData["MESS_ACCOUNT"]  = "";
+                $arrayData["MESS_PASSWORD"] = "";
+                $arrayData["MAIL_TO"]       = "";
+                $arrayData["MESS_DEFAULT"]  = 1;
 
-                    $arrayData = $emailSever->create2($arrayData);
-                /*----------------------------------********---------------------------------*/
-                }
-                /*----------------------------------********---------------------------------*/
+                $arrayData = $emailSever->create2($arrayData);
             }
         }
 
@@ -2283,4 +2277,3 @@ class workspaceTools
         }
     }
 }
-
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index fd7df39a4..94ca9e598 100644
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -836,15 +836,7 @@ class Installer extends Controller
                 ) ) ) . "'
                            )" );
 
-                /*----------------------------------********---------------------------------*/
-                if (true) {
-                    //
-                } else {
-                /*----------------------------------********---------------------------------*/
-                    $this->mysqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
-                /*----------------------------------********---------------------------------*/
-                }
-                /*----------------------------------********---------------------------------*/
+                $this->mysqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
             }
 
             // Change admin user
@@ -1151,15 +1143,7 @@ class Installer extends Controller
                 ) ) ) . "'
                            )" );
 
-                /*----------------------------------********---------------------------------*/
-                if (true) {
-                    //
-                } else {
-                /*----------------------------------********---------------------------------*/
-                    $this->mssqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
-                /*----------------------------------********---------------------------------*/
-                }
-                /*----------------------------------********---------------------------------*/
+                $this->mssqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
             }
 
             //change admin user