diff --git a/server/web-sockets/redisSocketEvents.js b/server/web-sockets/redisSocketEvents.js
index 5cda88569..9e35b00c0 100644
--- a/server/web-sockets/redisSocketEvents.js
+++ b/server/web-sockets/redisSocketEvents.js
@@ -33,12 +33,14 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
       try {
         const room = getBodyshopRoom(bodyshopUUID);
         socket.join(room);
-        await addUserToRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
+
         createLogEvent(socket, "DEBUG", `Client joined bodyshop room: ${room}`);
 
+        // TODO Removed room functionality for now
+        // await addUserToRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
         // Notify all users in the room about the updated user list
-        const usersInRoom = await getUsersInRoom(room);
-        io.to(room).emit("room-users-updated", usersInRoom);
+        // const usersInRoom = await getUsersInRoom(room);
+        // io.to(room).emit("room-users-updated", usersInRoom);
       } catch (error) {
         createLogEvent(socket, "ERROR", `Error joining room: ${error}`);
       }
@@ -54,14 +56,14 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
       }
     });
 
-    socket.on("get-room-users", async (bodyshopUUID, callback) => {
-      try {
-        const usersInRoom = await getUsersInRoom(getBodyshopRoom(bodyshopUUID));
-        callback(usersInRoom);
-      } catch (error) {
-        createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
-      }
-    });
+    // socket.on("get-room-users", async (bodyshopUUID, callback) => {
+    //   try {
+    //     const usersInRoom = await getUsersInRoom(getBodyshopRoom(bodyshopUUID));
+    //     callback(usersInRoom);
+    //   } catch (error) {
+    //     createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
+    //   }
+    // });
 
     socket.on("broadcast-to-bodyshop", async (bodyshopUUID, message) => {
       try {
@@ -77,11 +79,12 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
       try {
         createLogEvent(socket, "DEBUG", `User disconnected.`);
 
+        // TODO Remove room functionality for now
         // Get all rooms the socket is part of
-        const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
-        for (const room of rooms) {
-          await removeUserFromRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
-        }
+        //   const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
+        //   for (const room of rooms) {
+        //     await removeUserFromRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
+        //   }
       } catch (error) {
         createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
       }