diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index a477e0e58a..659ec5a24b 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1542,11 +1542,6 @@ function phpbb_import_avatar($user_avatar)
 		// Uploaded avatar
 		return import_avatar($user_avatar, false, $convert_row['user_id']);
 	}
-	else if ($convert_row['user_avatar_type'] == 2)
-	{
-		// Remote avatar
-		return $user_avatar;
-	}
 	else if ($convert_row['user_avatar_type'] == 3)
 	{
 		// Gallery avatar
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 1a6866d535..6024907c9e 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -121,7 +121,6 @@ $lang = array_merge($lang, array(
 	'EDIT_REASON'				=> 'Reason for editing this post',
 	'EMPTY_FILEUPLOAD'			=> 'The uploaded file is empty.',
 	'EMPTY_MESSAGE'				=> 'You must enter a message when posting.',
-	'EMPTY_REMOTE_DATA'			=> 'File could not be uploaded, please try uploading the file manually.',
 
 	'FLASH_IS_OFF'				=> '[flash] is <em>OFF</em>',
 	'FLASH_IS_ON'				=> '[flash] is <em>ON</em>',
@@ -236,7 +235,6 @@ $lang = array_merge($lang, array(
 	),
 	'QUOTE_NO_NESTING'			=> 'You may not embed quotes within each other.',
 
-	'REMOTE_UPLOAD_TIMEOUT'		=> 'The specified file could not be uploaded because the request timed out.',
 	'SAVE'						=> 'Save',
 	'SAVE_DATE'					=> 'Saved at',
 	'SAVE_DRAFT'				=> 'Save draft',
diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index dd1e23fd3a..1577e67739 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -46,9 +46,6 @@ class upload
 	/** @var string Prefix for language variables of errors */
 	public $error_prefix = '';
 
-	/** @var int Timeout for remote upload */
-	public $upload_timeout = 6;
-
 	/** @var \phpbb\files\factory Files factory */
 	protected $factory;
 
diff --git a/tests/files/type_foo.php b/tests/files/type_foo.php
index 95940b9d2f..ab39039ca3 100644
--- a/tests/files/type_foo.php
+++ b/tests/files/type_foo.php
@@ -13,7 +13,7 @@
 
 namespace phpbb\files\types;
 
-class foo extends \phpbb\files\types\remote
+class foo extends \phpbb\files\types\upload
 {
 	static public $tempnam_path;
 }