diff --git a/phpBB/phpbb/storage/adapter/adapter_interface.php b/phpBB/phpbb/storage/adapter/adapter_interface.php
index fb214f5b07..b2f6043741 100644
--- a/phpBB/phpbb/storage/adapter/adapter_interface.php
+++ b/phpBB/phpbb/storage/adapter/adapter_interface.php
@@ -30,7 +30,6 @@ interface adapter_interface
 	 *
 	 * @throws \phpbb\storage\exception\exception		When the file already exists
 	 * 													When the file cannot be written
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function put_contents($path, $content);
 
@@ -41,7 +40,6 @@ interface adapter_interface
 	 *
 	 * @throws \phpbb\storage\exception\exception		When the file dont exists
 	 * 													When cannot read file contents
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 *
 	 * @return string	Returns file contents
 	 *
@@ -53,8 +51,6 @@ interface adapter_interface
 	 *
 	 * @param string	$path	file/directory to check
 	 *
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
-	 *
 	 * @return bool	Returns true if the file/directory exist, false otherwise.
 	 */
 	public function exists($path);
@@ -65,7 +61,6 @@ interface adapter_interface
 	 * @param string	$path	file/directory to remove
 	 *
 	 * @throws \phpbb\storage\exception\exception		When removal fails.
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function delete($path);
 
@@ -77,7 +72,6 @@ interface adapter_interface
 	 *
 	 * @throws \phpbb\storage\exception\exception		When target exists
 	 * 													When file/directory cannot be renamed
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function rename($path_orig, $path_dest);
 
@@ -89,7 +83,6 @@ interface adapter_interface
 	 *
 	 * @throws \phpbb\storage\exception\exception		When target exists
 	 * 													When the file cannot be copied
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function copy($path_orig, $path_dest);
 }
diff --git a/phpBB/phpbb/storage/exception/not_implemented.php b/phpBB/phpbb/storage/exception/not_implemented.php
deleted file mode 100644
index df535048e5..0000000000
--- a/phpBB/phpbb/storage/exception/not_implemented.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\storage\exception;
-
-class not_implemented extends exception
-{
-
-}
diff --git a/phpBB/phpbb/storage/storage.php b/phpBB/phpbb/storage/storage.php
index ee581290d3..609a05cbd1 100644
--- a/phpBB/phpbb/storage/storage.php
+++ b/phpBB/phpbb/storage/storage.php
@@ -68,7 +68,6 @@ class storage
 	 *
 	 * @throws \phpbb\storage\exception\exception		When the file already exists
 	 * 													When the file cannot be written
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function put_contents($path, $content)
 	{
@@ -82,7 +81,6 @@ class storage
 	 *
 	 * @throws \phpbb\storage\exception\exception		When the file dont exists
 	 * 													When cannot read file contents
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 *
 	 * @return string	Returns file contents
 	 *
@@ -97,8 +95,6 @@ class storage
 	 *
 	 * @param string	$path	file/directory to check
 	 *
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
-	 *
 	 * @return bool	Returns true if the file/directory exist, false otherwise.
 	 */
 	public function exists($path)
@@ -112,7 +108,6 @@ class storage
 	 * @param string	$path	file/directory to remove
 	 *
 	 * @throws \phpbb\storage\exception\exception		When removal fails.
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function delete($path)
 	{
@@ -127,7 +122,6 @@ class storage
 	 *
 	 * @throws \phpbb\storage\exception\exception		When target exists
 	 * 													When file/directory cannot be renamed
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function rename($path_orig, $path_dest)
 	{
@@ -142,7 +136,6 @@ class storage
 	 *
 	 * @throws \phpbb\storage\exception\exception		When target exists
 	 * 													When the file cannot be copied
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function copy($path_orig, $path_dest)
 	{
@@ -184,7 +177,6 @@ class storage
 	 * @param string	$path		The target file
 	 * @param resource	$resource	The resource
 	 *										When target file cannot be created
-	 * @throws \phpbb\storage\exception\not_implemented	When the adapter doesnt implement the method
 	 */
 	public function write_stream($path, $resource)
 	{