diff --git a/src/PHPCensor/Languages/lang.da.php b/src/PHPCensor/Languages/lang.da.php
index 648832cb..16c9d79e 100644
--- a/src/PHPCensor/Languages/lang.da.php
+++ b/src/PHPCensor/Languages/lang.da.php
@@ -293,5 +293,4 @@ du kører composer update.',
     'passing_build' => 'Succesfuldt Build',
     'failing_build' => 'Fejlet Build',
     'log_output' => 'Log-output:',
-    'shell_not_enabled' => 'Shell-plugin er ikke aktiveret. Aktivér det via config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.de.php b/src/PHPCensor/Languages/lang.de.php
index 0f905c5b..0d0d58e6 100644
--- a/src/PHPCensor/Languages/lang.de.php
+++ b/src/PHPCensor/Languages/lang.de.php
@@ -316,7 +316,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'passing_build' => 'Durchlaufender Build',
     'failing_build' => 'Fehlschlagender Build',
     'log_output' => 'Protokollausgabe: ',
-    'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.',
 
     // Error Levels:
     'critical' => 'Kritisch',
diff --git a/src/PHPCensor/Languages/lang.el.php b/src/PHPCensor/Languages/lang.el.php
index 1e180868..a325e311 100644
--- a/src/PHPCensor/Languages/lang.el.php
+++ b/src/PHPCensor/Languages/lang.el.php
@@ -295,5 +295,4 @@ Services</a> του Bitbucket αποθετηρίου σας.',
     'passing_build' => 'Επιτυχημένη κατασκευή',
     'failing_build' => 'Αποτυχημένη κατασκευή',
     'log_output' => 'Σύνδεση εξόδου:',
-    'shell_not_enabled' => 'Το πρόσθετο για το κέλυφος δεν είναι ενεργοποιημένο. Παρακαλούμε ενεργοποιήστε το μέσω του αρχείου config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
index 335d0d52..6da0e0ee 100644
--- a/src/PHPCensor/Languages/lang.en.php
+++ b/src/PHPCensor/Languages/lang.en.php
@@ -350,7 +350,6 @@ PHP Censor',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
 
     // Error Levels:
diff --git a/src/PHPCensor/Languages/lang.es.php b/src/PHPCensor/Languages/lang.es.php
index 10c940f0..fc90e175 100644
--- a/src/PHPCensor/Languages/lang.es.php
+++ b/src/PHPCensor/Languages/lang.es.php
@@ -289,5 +289,4 @@ PHP Censor',
     'passing_build' => 'Build Exitoso',
     'failing_build' => 'Build Fallido',
     'log_output' => 'Log de Salida: ',
-    'shell_not_enabled' => 'El plugin shell no está habilitado. Por favor, habilitalo desde config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.fr.php b/src/PHPCensor/Languages/lang.fr.php
index 1be39d39..bbd20421 100644
--- a/src/PHPCensor/Languages/lang.fr.php
+++ b/src/PHPCensor/Languages/lang.fr.php
@@ -365,8 +365,9 @@ PHP Censor',
     'failed_allowed' => 'Autorisé',
     
     // Build Plugins:
-    'log_output' => 'Sortie de log : ',
-    'shell_not_enabled' => 'Le plugn shell n\'est pas activé. Merci de l\'activer via le fichier config.yml.',
+    'passing_build' => 'Build réussi',
+    'failing_build' => 'Build en echec',
+    'log_output'    => 'Sortie de log : ',
     
     // Error Levels:
     'critical' => 'Critique',
diff --git a/src/PHPCensor/Languages/lang.it.php b/src/PHPCensor/Languages/lang.it.php
index ffb1f186..67568c43 100644
--- a/src/PHPCensor/Languages/lang.it.php
+++ b/src/PHPCensor/Languages/lang.it.php
@@ -295,5 +295,4 @@ PHP Censor',
     'passing_build' => 'Build passata',
     'failing_build' => 'Build fallita',
     'log_output' => 'Log: ',
-    'shell_not_enabled' => 'Il plugin shell non è attivato. Per favore attivalo tramite config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.nl.php b/src/PHPCensor/Languages/lang.nl.php
index 26055285..c18be985 100644
--- a/src/PHPCensor/Languages/lang.nl.php
+++ b/src/PHPCensor/Languages/lang.nl.php
@@ -295,5 +295,4 @@ keer je composer update uitvoert.',
     'passing_build' => 'Slagende build',
     'failing_build' => 'Falende build',
     'log_output' => 'Log output:',
-    'shell_not_enabled' => 'De shell plugin is niet ingeschakeld, schakel deze a.u.b. in via het config.yml bestand.'
 ];
diff --git a/src/PHPCensor/Languages/lang.pl.php b/src/PHPCensor/Languages/lang.pl.php
index 75274398..0dc21564 100644
--- a/src/PHPCensor/Languages/lang.pl.php
+++ b/src/PHPCensor/Languages/lang.pl.php
@@ -296,5 +296,4 @@ wywołaniu polecenia composer update.',
     'passing_build' => 'Pomijanie Budowania',
     'failing_build' => 'Niepowodzenie Budowania',
     'log_output' => 'Log Wyjściowy:',
-    'shell_not_enabled' => 'Plugin powłoki jest nieaktywny. Aktywuj go poprzez config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.pt-br.php b/src/PHPCensor/Languages/lang.pt-br.php
index c777736d..a5b98013 100644
--- a/src/PHPCensor/Languages/lang.pt-br.php
+++ b/src/PHPCensor/Languages/lang.pt-br.php
@@ -317,7 +317,6 @@ PHP Censor',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
     // Error Levels:
     'critical' => 'Critical',
diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
index b4c70566..50e3f34f 100644
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@@ -335,7 +335,6 @@ PHP Censor',
     'passing_build' => 'Успех сборки',
     'failing_build' => 'Провал сборки',
     'log_output' => 'Вывод лога: ',
-    'shell_not_enabled' => 'Плагин shell не включен. Пожалуйста, включите его в файле config.yml.',
     
     // Error Levels:
     'critical' => 'Критичный',
diff --git a/src/PHPCensor/Languages/lang.uk.php b/src/PHPCensor/Languages/lang.uk.php
index ff83c1b9..7767470d 100644
--- a/src/PHPCensor/Languages/lang.uk.php
+++ b/src/PHPCensor/Languages/lang.uk.php
@@ -295,5 +295,4 @@ PHP Censor',
     'passing_build' => 'Успішно збірка',
     'failing_build' => 'Невдала збірка',
     'log_output' => 'Вивід лога:',
-    'shell_not_enabled' => 'Плагін shell не увімкнений. Будь ласка, увімкніть його через config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.zh.php b/src/PHPCensor/Languages/lang.zh.php
index 2bbf93d5..de37f9db 100644
--- a/src/PHPCensor/Languages/lang.zh.php
+++ b/src/PHPCensor/Languages/lang.zh.php
@@ -310,7 +310,6 @@ PHP Censor',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
     // Error Levels:
     'critical' => 'Critical',
diff --git a/src/PHPCensor/Plugin/Codeception.php b/src/PHPCensor/Plugin/Codeception.php
index 966273a4..35121b1d 100644
--- a/src/PHPCensor/Plugin/Codeception.php
+++ b/src/PHPCensor/Plugin/Codeception.php
@@ -10,7 +10,6 @@
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin\Util\TestResultParsers\Codeception as Parser;
 use PHPCensor\Plugin;
diff --git a/src/PHPCensor/Plugin/Util/Executor.php b/src/PHPCensor/Plugin/Util/Executor.php
index c860a696..aa20a2ed 100644
--- a/src/PHPCensor/Plugin/Util/Executor.php
+++ b/src/PHPCensor/Plugin/Util/Executor.php
@@ -136,8 +136,7 @@ class Executor
         foreach ($plugins as $plugin => $options) {
             $this->logger->log("\n" . 
                 sprintf('RUNNING PLUGIN: %s', Lang::get($plugin)) . ' (' .
-                'Stage' . ': ' . 
-                Lang::get('stage_' . $stage) . ')'
+                'Stage' . ': ' . ucfirst($stage) . ')'
             );
 
             $this->setPluginStatus($stage, $plugin, Build::STATUS_RUNNING);
diff --git a/src/PHPCensor/Service/BuildService.php b/src/PHPCensor/Service/BuildService.php
index aaf5a85b..26017a16 100644
--- a/src/PHPCensor/Service/BuildService.php
+++ b/src/PHPCensor/Service/BuildService.php
@@ -69,7 +69,7 @@ class BuildService
             $build->setCommitId($commitId);
         } else {
             $build->setCommitId('Manual');
-            $build->setCommitMessage(Lang::get('manual_build'));
+            $build->setCommitMessage('Manual');
         }
 
         if (!is_null($branch)) {
diff --git a/tests/PHPCensor/Service/BuildServiceTest.php b/tests/PHPCensor/Service/BuildServiceTest.php
index 65df07d7..ba0f97ad 100644
--- a/tests/PHPCensor/Service/BuildServiceTest.php
+++ b/tests/PHPCensor/Service/BuildServiceTest.php
@@ -54,7 +54,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($returnValue->getStarted());
         $this->assertNull($returnValue->getFinished());
         $this->assertNull($returnValue->getLog());
-        $this->assertEquals(\PHPCensor\Helper\Lang::get('manual_build'), $returnValue->getCommitMessage());
+        $this->assertEquals('Manual', $returnValue->getCommitMessage());
         $this->assertNull($returnValue->getCommitterEmail());
         $this->assertNull($returnValue->getExtra());
         $this->assertEquals('master', $returnValue->getBranch());