diff --git a/modules/user/views_handler_field_user.inc b/modules/user/views_handler_field_user.inc
index f6b15b5..65ecd48 100644
--- a/modules/user/views_handler_field_user.inc
+++ b/modules/user/views_handler_field_user.inc
@@ -16,9 +16,7 @@ class views_handler_field_user extends views_handler_field {
    */
   function init(&$view, &$data) {
     parent::init($view, $data);
-    if (!empty($this->options['link_to_user'])) {
-      $this->additional_fields['uid'] = 'uid';
-    }
+    $this->additional_fields['uid'] = 'uid';
   }
 
   function option_definition() {
diff --git a/modules/user/views_handler_field_user_language.inc b/modules/user/views_handler_field_user_language.inc
index e29da31..c3bd854 100644
--- a/modules/user/views_handler_field_user_language.inc
+++ b/modules/user/views_handler_field_user_language.inc
@@ -31,9 +31,4 @@ class views_handler_field_user_language extends views_handler_field_user {
 
     return $this->sanitize_value($lang->name);
   }
-
-  function render($values) {
-    $value = $this->get_value($values);
-    return $this->render_link($this->sanitize_value($value), $values);
-  }
 }
diff --git a/modules/user/views_handler_field_user_name.inc b/modules/user/views_handler_field_user_name.inc
index 4551451..2fc9d53 100644
--- a/modules/user/views_handler_field_user_name.inc
+++ b/modules/user/views_handler_field_user_name.inc
@@ -11,16 +11,6 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_user_name extends views_handler_field_user {
-  /**
-   * Add uid in the query so we can test for anonymous if needed.
-   */
-  function init(&$view, &$data) {
-    parent::init($view, $data);
-    if (!empty($this->options['overwrite_anonymous']) || !empty($this->options['format_username'])) {
-      $this->additional_fields['uid'] = 'uid';
-    }
-  }
-
   function option_definition() {
     $options = parent::option_definition();
 
