diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d58dfc32a..2ab2838c2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,8 +3,6 @@
 #   the COPYRIGHT file.
 
 class ApplicationController < ActionController::Base
-  include LanguageHelper
-
   protect_from_forgery :except => :receive
 
   before_filter :set_friends_and_status, :except => [:create, :update]
diff --git a/app/models/user.rb b/app/models/user.rb
index 5e8bf087c..c52d2c033 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,7 +19,6 @@ class User
   include MongoMapper::Document
   include Diaspora::UserModules
   include Encryptor::Private
-  include LanguageHelper
 
   plugin MongoMapper::Devise
 
diff --git a/config/languages.yml b/config/languages.yml
index 5df33034f..510b10090 100644
--- a/config/languages.yml
+++ b/config/languages.yml
@@ -14,4 +14,4 @@ available:
   ro: 'Română'
   ru: 'Россию'
   sv: 'Svenska'
-  tr: 'Türk'
\ No newline at end of file
+  tr: 'Türk'