diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 3c683afacb4..72dd5816ea0 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -1166,7 +1166,6 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$query = \OCP\DB::prepare($statement);
 		$result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_LINK));
 		$this->assertSame(1, $result);
-		$statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
 		$query = \OCP\DB::prepare($statement);
 		$result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_USER));
 		$this->assertSame(1, $result);
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 8f2071dd7b6..371162cd16f 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -14,5 +14,3 @@ OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "wri
 OCP\Util::connectHook('OC_Filesystem', 'post_delete', "OCA\Files_Versions\Hooks", "remove_hook");
 OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Versions\Hooks", "pre_remove_hook");
 OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook");
-//Listen to delete user signal
-OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Versions\Hooks", "deleteUser_hook");
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 2de4001affd..990f1403e8d 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -74,19 +74,4 @@ class Hooks {
 		}
 	}
 
-	/**
-	 * clean up user specific settings if user gets deleted
-	 * @param array $params array with uid
-	 *
-	 * This function is connected to the pre_deleteUser signal of OC_Users
-	 * to remove the used space for versions stored in the database
-	 */
-	public static function deleteUser_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$uid = $params['uid'];
-			Storage::deleteUser($uid);
-		}
-	}
-
 }
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 15d0e032ea0..b912fc8ba76 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -301,17 +301,6 @@ class Storage {
 
 	}
 
-	/**
-	 * deletes used space for files versions in db if user was deleted
-	 *
-	 * @param string $uid id of deleted user
-	 * @return \OC_DB_StatementWrapper of db delete operation
-	 */
-	public static function deleteUser($uid) {
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_versions` WHERE `user`=?');
-		return $query->execute(array($uid));
-	}
-
 	/**
 	 * returns all stored file versions from a given user
 	 * @param string $uid id of the user
diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php
index 3a267874431..9ad31a272ea 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -101,7 +101,7 @@ class Storage {
 		$sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
 		\OC_DB::executeAudited($sql, array($storageId));
 
-		$numericId = self::exists($storageId);
+		$numericId = self::getNumericStorageId($storageId);
 		if (!is_null($numericId)) {
 			$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `storage` = ?';
 			\OC_DB::executeAudited($sql, array($numericId));