diff --git a/modules/system.views.inc b/modules/system.views.inc
index 3d3930b6be4a71415c6543f986e308df4f3c424e..243cbc725c749fb30491feeee622151089763c34 100644
--- a/modules/system.views.inc
+++ b/modules/system.views.inc
@@ -30,11 +30,6 @@ function system_views_data() {
   );
   $data['file_managed']['table']['entity type'] = 'file';
 
-
-  // The file table does not inherently join to the node table,
-  // but may things (such as upload.module) can add relationships
-  // that allow file fields to be used.
-
   // fid
   $data['file_managed']['fid'] = array(
     'title' => t('File ID'),
diff --git a/views.info b/views.info
index 3a11df2b152ab99044f1e9011d0d5872e4ce9ba7..75b5da5584fcf8a15b6e3d71acd12a00c0a2ff51 100644
--- a/views.info
+++ b/views.info
@@ -174,9 +174,6 @@ files[] = modules/translation/views_handler_filter_node_language.inc
 files[] = modules/translation/views_handler_filter_node_tnid.inc
 files[] = modules/translation/views_handler_filter_node_tnid_child.inc
 files[] = modules/translation/views_handler_relationship_translation.inc
-files[] = modules/upload/views_handler_field_upload_description.inc
-files[] = modules/upload/views_handler_field_upload_fid.inc
-files[] = modules/upload/views_handler_filter_upload_fid.inc
 files[] = modules/user/views_handler_argument_user_uid.inc
 files[] = modules/user/views_handler_argument_users_roles_rid.inc
 files[] = modules/user/views_handler_field_user.inc
diff --git a/views.module b/views.module
index a00916a20d02e061476639b9d26cb816306612c0..3d34603365a0268ad1ae5ab441bdf619c56b6910 100644
--- a/views.module
+++ b/views.module
@@ -2429,10 +2429,6 @@ function taxonomy_views_api() { return views_views_api(); }
   function translation_views_api() { return views_views_api(); }
 }
 
-if (!function_exists('upload_views_api')) {
-  function upload_views_api() { return views_views_api(); }
-}
-
 if (!function_exists('user_views_api')) {
   function user_views_api() { return views_views_api(); }
 }