diff --git a/src/modules/login/message.ts b/src/modules/login/message.ts
index 02d21a7..4f165d7 100644
--- a/src/modules/login/message.ts
+++ b/src/modules/login/message.ts
@@ -7,12 +7,10 @@ import {
 import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message";
 
 function loginStatusRequest(): SocketMessage {
-  return {
-    variant: "LoginStatusRequest",
-    fields: [],
-  };
+  return "LoginStatusRequest";
 }
 
+// TODO: Adapt to new response format.
 function handleLoginStatusResponse(dispatch: AppDispatch, outerFields: any[]) {
   if (outerFields.length !== 1) {
     console.log("LoginStatusResponse has wrong number of fields:", outerFields);
diff --git a/src/modules/room/message.ts b/src/modules/room/message.ts
index 2812861..eb97709 100644
--- a/src/modules/room/message.ts
+++ b/src/modules/room/message.ts
@@ -3,12 +3,10 @@ import { roomMessage, roomGetAll, roomSetAll } from "modules/room/slice";
 import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message";
 
 function roomListRequest(): SocketMessage {
-  return {
-    variant: "RoomListRequest",
-    fields: [],
-  };
+  return "RoomListRequest";
 }
 
+// TODO: Adapt to new response format.
 function handleRoomListResponse(dispatch: AppDispatch, outerFields: any[]) {
   if (outerFields.length !== 1) {
     console.log("RoomListResponse has wrong number of fields:", outerFields);
@@ -24,6 +22,7 @@ function handleRoomListResponse(dispatch: AppDispatch, outerFields: any[]) {
   dispatch(roomSetAll(rooms));
 }
 
+// TODO: Adapt to new response format.
 function handleRoomMessageResponse(dispatch: AppDispatch, outerFields: any[]) {
   if (outerFields.length !== 1) {
     console.log("RoomMessageResponse has wrong number of fields:", outerFields);
@@ -34,6 +33,7 @@ function handleRoomMessageResponse(dispatch: AppDispatch, outerFields: any[]) {
 }
 
 export const roomSocketMessageMiddleware: SocketMessageMiddleware = {
+  // TODO: Adapt to new response format.
   handleMessage: (dispatch, { variant, fields }) => {
     switch (variant) {
       case "RoomListResponse":
diff --git a/src/modules/user/message.ts b/src/modules/user/message.ts
index ce2ee03..1eb4c40 100644
--- a/src/modules/user/message.ts
+++ b/src/modules/user/message.ts
@@ -3,12 +3,10 @@ import { userGetAll, userSetAll } from "modules/user/slice";
 import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message";
 
 function userListRequest(): SocketMessage {
-  return {
-    variant: "UserListRequest",
-    fields: [],
-  };
+  return "UserListRequest";
 }
 
+// TODO: Adapt to new response format.
 function handleUserListResponse(dispatch: AppDispatch, outerFields: any[]) {
   if (outerFields.length !== 1) {
     console.log("UserListResponse has wrong number of fields:", outerFields);
@@ -25,6 +23,7 @@ function handleUserListResponse(dispatch: AppDispatch, outerFields: any[]) {
 }
 
 export const userSocketMessageMiddleware: SocketMessageMiddleware = {
+  // TODO: Adapt to new response format.
   handleMessage: (dispatch, { variant, fields }) => {
     switch (variant) {
       case "UserListResponse":