diff --git a/application/controllers/admin/translate.php b/application/controllers/admin/translate.php
index eb7cbba01e4..6a851747a2f 100644
--- a/application/controllers/admin/translate.php
+++ b/application/controllers/admin/translate.php
@@ -357,7 +357,6 @@ private function _getSurveyButton($iSurveyID, $menuitem_url)
 	/*
 	* _getLanguageList() returns survey language list
 	* @param string $iSurveyID Survey id
-	* @param string @clang Language object
 	* @param string $tolang The target translation code
 	*/
 	private function _getLanguageList($iSurveyID, $tolang)
diff --git a/application/helpers/admin/export/DocWriter.php b/application/helpers/admin/export/DocWriter.php
index 2f3128811be..7233d86bd00 100644
--- a/application/helpers/admin/export/DocWriter.php
+++ b/application/helpers/admin/export/DocWriter.php
@@ -19,7 +19,7 @@ public function __construct()
     public function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
     {
         parent::init($survey, $sLanguageCode, $oOptions);
-        $this->clang = new limesurvey_lang($sLanguageCode);
+        App()->setLanguage($sLanguageCode);
 
         if ($oOptions->output=='display')
         {
@@ -71,7 +71,7 @@ protected function outputRecord($headers, $values, FormattingOptions $oOptions)
             {
                 $this->output .= "<br clear='all' style='page-break-before:always'>";
             }
-            $this->output .= "<table><tr><th colspan='2'>".$this->clang->gT("Survey response")."</td></tr>".PHP_EOL;
+            $this->output .= "<table><tr><th colspan='2'>".gT("Survey response")."</td></tr>".PHP_EOL;
 
             $counter = 0;
             foreach ($headers as $header)
diff --git a/application/helpers/admin/export/PdfWriter.php b/application/helpers/admin/export/PdfWriter.php
index 99bc62313d9..c59eabb5b92 100644
--- a/application/helpers/admin/export/PdfWriter.php
+++ b/application/helpers/admin/export/PdfWriter.php
@@ -56,7 +56,7 @@ public function outputRecord($headers, $values, FormattingOptions $oOptions)
             {
                 $this->pdf->AddPage();
             }
-            $this->pdf->Cell(0, 10, sprintf($this->clang->gT("Survey response %d"), $this->rowCounter), 1, 1);
+            $this->pdf->Cell(0, 10, sprintf(gT("Survey response %d"), $this->rowCounter), 1, 1);
 
             $columnCounter = 0;
             foreach($headers as $header)
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 905cb5d298e..177de235467 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -5335,7 +5335,7 @@ function conditionalNewlineToBreak($mytext,$ishtml,$encoded='')
 {
     if ($ishtml === true)
     {
-        // $mytext has been processed by clang->gT with html mode
+        // $mytext has been processed by gT with html mode
         // and thus \n has already been translated to &#10;
         if ($encoded == '')
         {
diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
index 6f9c424dba0..78d17de82a1 100644
--- a/application/helpers/replacements_helper.php
+++ b/application/helpers/replacements_helper.php
@@ -36,7 +36,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     'percentcomplete', 'move', 'groupname', 'groupdescription', 'question', 'showxquestions',
     'showgroupinfo', 'showqnumcode', 'questioncode', 'answer', 'navigator', 'help', 'totalquestions',
     'surveyformat', 'completed', 'notanswered', 'privacy', 'surveyid', 'publicurl',
-    'templatedir', 'token', 'assessments', 's_lang', 'errormsg', 'clang', 'saved_id', 'usertemplaterootdir',
+    'templatedir', 'token', 'assessments', 's_lang', 'errormsg', 'saved_id', 'usertemplaterootdir',
     'languagechanger', 'printoutput', 'captchapath', 'loadname');
     */
     $allowedvars = array(
diff --git a/application/views/admin/emailtemplates/email_language_tab.php b/application/views/admin/emailtemplates/email_language_tab.php
index 5d924ec8d07..fb11f2016f2 100644
--- a/application/views/admin/emailtemplates/email_language_tab.php
+++ b/application/views/admin/emailtemplates/email_language_tab.php
@@ -85,14 +85,14 @@
             )
         )
     );
-    
-    
+
+
     echo "<div id='tab-$grouplang'>";
     echo "<div class='tabsinner' id='tabsinner-$grouplang'>";
 ?>
 
-            
-                
+
+
                     <ul>
                         <?php
                         foreach ($tabs as $tab => $details)
@@ -105,7 +105,7 @@
                     <?php
                     foreach ($tabs as $tab => $details)
                     {
-                        $this->renderPartial('/admin/emailtemplates/email_language_template_tab', compact('ishtml', 'surveyid' , 'esrow', 'grouplang', 'tab', 'details', 'clang'));
+                        $this->renderPartial('/admin/emailtemplates/email_language_template_tab', compact('ishtml', 'surveyid' , 'esrow', 'grouplang', 'tab', 'details'));
                     }
                     ?>
                 </div>
diff --git a/application/views/admin/emailtemplates/emailtemplates_view.php b/application/views/admin/emailtemplates/emailtemplates_view.php
index 329bfaae76f..d01411d18de 100644
--- a/application/views/admin/emailtemplates/emailtemplates_view.php
+++ b/application/views/admin/emailtemplates/emailtemplates_view.php
@@ -50,7 +50,7 @@
                 {
                     $aDefaultTexts['admin_detailed_notification']=$aDefaultTexts['admin_detailed_notification_css'].conditionalNewlineToBreak($aDefaultTexts['admin_detailed_notification'],$ishtml);
                 }
-                $this->renderPartial('/admin/emailtemplates/email_language_tab', compact('surveyinfo', 'ishtml', 'surveyid', 'clang', 'grouplang', 'bplang', 'esrow', 'aDefaultTexts'));
+                $this->renderPartial('/admin/emailtemplates/email_language_tab', compact('surveyinfo', 'ishtml', 'surveyid', 'grouplang', 'bplang', 'esrow', 'aDefaultTexts'));
             }
             ?>
     </div>
diff --git a/application/views/installer/dbconfig_view.php b/application/views/installer/dbconfig_view.php
index af411759b52..c5187c6efa4 100644
--- a/application/views/installer/dbconfig_view.php
+++ b/application/views/installer/dbconfig_view.php
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="span3">
-        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
+        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
     </div>
     <div class="span9">
         <?php echo CHtml::beginForm($this->createUrl('installer/database'), 'post', array('class' => 'form-horizontal')); ?>
@@ -53,7 +53,7 @@
                     echo CHtml::tag('div', array('class' => 'controls'), $row['control'] . CHtml::tag('div', array('class' => 'description-field'), $row['description']));
                 echo CHtml::closeTag('div');
             }
-            
+
             ?>
         </fieldset>
         <div class="row">
diff --git a/application/views/installer/dbsettings_view.php b/application/views/installer/dbsettings_view.php
index 32b6cfc0f9c..30802b56ac4 100644
--- a/application/views/installer/dbsettings_view.php
+++ b/application/views/installer/dbsettings_view.php
@@ -1,13 +1,13 @@
 <div class="row">
     <div class="span3">
-        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
+        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
     </div>
     <div class="span9">
         <h2><?php echo $title; ?></h2>
         <p><?php echo $descp; ?></p>
             <h3><?php eT('Database creation'); ?></h3>
                 <?php if (isset($adminoutputText)) echo $adminoutputText; ?>
-    
+
             <div class="row">
                 <div class="span3" >
                     <input class="btn" type="button" value="<?php eT('Previous'); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/database"); ?>', '_top')" />
diff --git a/application/views/installer/license_view.php b/application/views/installer/license_view.php
index 198a5e77c6d..7c7d280ef30 100644
--- a/application/views/installer/license_view.php
+++ b/application/views/installer/license_view.php
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="span3">
-        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
+        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep',)); ?>
     </div>
     <div class="span9">
         <?php
diff --git a/application/views/installer/optconfig_view.php b/application/views/installer/optconfig_view.php
index 4030ab923f6..b05584f787e 100644
--- a/application/views/installer/optconfig_view.php
+++ b/application/views/installer/optconfig_view.php
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="span3">
-        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
+        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', )); ?>
     </div>
     <div class="span9">
     <?php echo CHtml::beginForm($this->createUrl('installer/optional'), 'post', array('class' => 'form-horizontal')); ?>
@@ -12,7 +12,7 @@
     </div>
     <?php  ?>
     <fieldset>
-    <legend><?php 
+    <legend><?php
         eT("You can leave these settings blank and change them later");
         ?>
 
diff --git a/application/views/installer/success_view.php b/application/views/installer/success_view.php
index a684ed7da5d..ff2b73929c2 100644
--- a/application/views/installer/success_view.php
+++ b/application/views/installer/success_view.php
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="span3">
-        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
+        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
     </div>
     <div class="span9">
         <h2><?php echo $title; ?></h2>
diff --git a/application/views/installer/welcome_view.php b/application/views/installer/welcome_view.php
index 335f38379f3..f31c1a5adab 100644
--- a/application/views/installer/welcome_view.php
+++ b/application/views/installer/welcome_view.php
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="span3">
-        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
+        <?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
     </div>
     <div class="span9">
         <h2><?php echo $title; ?></h2>
@@ -33,5 +33,5 @@
             </div>
         <?php echo CHtml::endForm(); ?>
     </div>
-    
+
 </div>