diff --git a/file/lib/data/room/RoomAction.class.php b/file/lib/data/room/RoomAction.class.php
index d89f81d..8ba22aa 100644
--- a/file/lib/data/room/RoomAction.class.php
+++ b/file/lib/data/room/RoomAction.class.php
@@ -69,16 +69,12 @@ public function prune() {
 			WHERE
 					permanent = ?
 				AND 	roomID NOT IN (
-					SELECT
-						fieldValue AS roomID 
-					FROM
-						wcf".WCF_N."_user_storage
-					WHERE
-							field = ?
-						AND	fieldValue IS NOT NULL
-				)";
+						SELECT	chatRoomID
+						FROM	wcf".WCF_N."_user
+						WHERE	chatRoomID IS NOT NULL
+					)";
 		$stmt = \wcf\system\WCF::getDB()->prepareStatement($sql);
-		$stmt->execute(array(0, 'roomID'));
+		$stmt->execute(array(0));
 		$objectIDs = array();
 		
 		while ($objectID = $stmt->fetchColumn()) $objectIDs[] = $objectID;
diff --git a/file/lib/util/ChatUtil.class.php b/file/lib/util/ChatUtil.class.php
index b9c1f2f..06c50a5 100644
--- a/file/lib/util/ChatUtil.class.php
+++ b/file/lib/util/ChatUtil.class.php
@@ -1,7 +1,6 @@
 <?php
 namespace chat\util;
 use \wcf\data\package\PackageCache;
-use \wcf\system\user\storage\UserStorageHandler;
 use \wcf\system\WCF;
 
 /**