diff --git a/src/GraphQl/Mutations/OrganizationMutations.ts b/src/GraphQl/Mutations/OrganizationMutations.ts
index c72975b380..3ef2562df9 100644
--- a/src/GraphQl/Mutations/OrganizationMutations.ts
+++ b/src/GraphQl/Mutations/OrganizationMutations.ts
@@ -110,93 +110,11 @@ export const SEND_MESSAGE_TO_CHAT = gql`
     $chatId: ID!
     $replyTo: ID
     $messageContent: String!
-    $type: String!
   ) {
     sendMessageToChat(
       chatId: $chatId
       replyTo: $replyTo
       messageContent: $messageContent
-      type: $type
-    ) {
-      _id
-      createdAt
-      messageContent
-      replyTo {
-        _id
-        createdAt
-        messageContent
-        sender {
-          _id
-          firstName
-          lastName
-        }
-        updatedAt
-      }
-      sender {
-        _id
-        firstName
-        lastName
-      }
-      updatedAt
-    }
-  }
-`;
-
-export const SEND_MESSAGE_TO_DIRECT_CHAT = gql`
-  mutation sendMessageToDirectChat(
-    $chatId: ID!
-    $replyTo: ID
-    $messageContent: String!
-  ) {
-    sendMessageToDirectChat(
-      chatId: $chatId
-      replyTo: $replyTo
-      messageContent: $messageContent
-    ) {
-      _id
-      createdAt
-      messageContent
-      replyTo {
-        _id
-        createdAt
-        messageContent
-        receiver {
-          _id
-          firstName
-          lastName
-        }
-        sender {
-          _id
-          firstName
-          lastName
-        }
-        updatedAt
-      }
-      receiver {
-        _id
-        firstName
-        lastName
-      }
-      sender {
-        _id
-        firstName
-        lastName
-      }
-      updatedAt
-    }
-  }
-`;
-
-export const SEND_MESSAGE_TO_GROUP_CHAT = gql`
-  mutation sendMessageToGroupChat(
-    $chatId: ID!
-    $replyTo: ID
-    $messageContent: String!
-  ) {
-    sendMessageToGroupChat(
-      chatId: $chatId
-      replyTo: $replyTo
-      messageContent: $messageContent
     ) {
       _id
       createdAt
@@ -240,30 +158,6 @@ export const CREATE_MESSAGE_CHAT = gql`
   }
 `;
 
-export const MESSAGE_SENT_TO_DIRECT_CHAT = gql`
-  subscription messageSentToDirectChat($userId: ID!) {
-    messageSentToDirectChat(userId: $userId) {
-      _id
-      createdAt
-      directChatMessageBelongsTo {
-        _id
-      }
-      messageContent
-      receiver {
-        _id
-        firstName
-        lastName
-      }
-      sender {
-        _id
-        firstName
-        lastName
-      }
-      updatedAt
-    }
-  }
-`;
-
 export const MESSAGE_SENT_TO_CHAT = gql`
   subscription messageSentToChat($userId: ID!) {
     messageSentToChat(userId: $userId) {
@@ -284,7 +178,6 @@ export const MESSAGE_SENT_TO_CHAT = gql`
         }
         updatedAt
       }
-      type
       sender {
         _id
         firstName
@@ -295,24 +188,6 @@ export const MESSAGE_SENT_TO_CHAT = gql`
   }
 `;
 
-export const MESSAGE_SENT_TO_GROUP_CHAT = gql`
-  subscription messageSentToGroupChat($userId: ID!) {
-    messageSentToGroupChat(userId: $userId) {
-      _id
-      createdAt
-      groupChatMessageBelongsTo {
-        _id
-      }
-      messageContent
-      sender {
-        _id
-        firstName
-        lastName
-      }
-      updatedAt
-    }
-  }
-`;
 //Plugin WebSocket listner
 
 /**
diff --git a/src/GraphQl/Queries/PlugInQueries.ts b/src/GraphQl/Queries/PlugInQueries.ts
index 8a35b4ba7b..91e7a29d07 100644
--- a/src/GraphQl/Queries/PlugInQueries.ts
+++ b/src/GraphQl/Queries/PlugInQueries.ts
@@ -108,83 +108,6 @@ export const ORGANIZATION_EVENTS_CONNECTION = gql`
 
 // directChatsMessagesByChatID(id: ID!): [DirectChatMessage]
 
-export const DIRECT_CHAT_MESSAGES_BY_CHAT_ID = gql`
-  query directChatsMessagesByChatID($id: ID!) {
-    directChatsMessagesByChatID(id: $id) {
-      _id
-      createdAt
-      messageContent
-      receiver {
-        _id
-        firstName
-        lastName
-        email
-        image
-      }
-      sender {
-        _id
-        firstName
-        lastName
-        email
-        image
-      }
-    }
-  }
-`;
-
-export const DIRECT_CHAT_BY_ID = gql`
-  query directChatById($id: ID!) {
-    directChatById(id: $id) {
-      _id
-      createdAt
-      messages {
-        _id
-        createdAt
-        messageContent
-        replyTo {
-          _id
-          createdAt
-          messageContent
-          receiver {
-            _id
-            firstName
-            lastName
-            email
-            image
-          }
-          sender {
-            _id
-            firstName
-            lastName
-            email
-            image
-          }
-        }
-        receiver {
-          _id
-          firstName
-          lastName
-          email
-          image
-        }
-        sender {
-          _id
-          firstName
-          lastName
-          email
-          image
-        }
-      }
-      users {
-        _id
-        firstName
-        lastName
-        email
-      }
-    }
-  }
-`;
-
 export const CHAT_BY_ID = gql`
   query chatById($id: ID!) {
     chatById(id: $id) {
@@ -195,47 +118,6 @@ export const CHAT_BY_ID = gql`
         _id
       }
       createdAt
-      messages {
-        _id
-        createdAt
-        messageContent
-        replyTo {
-          _id
-          createdAt
-          messageContent
-          type
-          sender {
-            _id
-            firstName
-            lastName
-            email
-            image
-          }
-        }
-        sender {
-          _id
-          firstName
-          lastName
-          email
-          image
-        }
-      }
-      users {
-        _id
-        firstName
-        lastName
-        email
-      }
-    }
-  }
-`;
-
-export const GROUP_CHAT_BY_ID = gql`
-  query groupChatById($id: ID!) {
-    groupChatById(id: $id) {
-      _id
-      createdAt
-      title
       messages {
         _id
         createdAt
@@ -265,7 +147,6 @@ export const GROUP_CHAT_BY_ID = gql`
         firstName
         lastName
         email
-        image
       }
     }
   }
@@ -278,43 +159,6 @@ export const CHATS_LIST = gql`
       isGroup
       name
 
-      creator {
-        _id
-        firstName
-        lastName
-        email
-      }
-      messages {
-        _id
-        type
-        createdAt
-        messageContent
-        sender {
-          _id
-          firstName
-          lastName
-          email
-        }
-      }
-      organization {
-        _id
-        name
-      }
-      users {
-        _id
-        firstName
-        lastName
-        email
-        image
-      }
-    }
-  }
-`;
-
-export const DIRECT_CHATS_LIST = gql`
-  query DirectChatsByUserID($id: ID!) {
-    directChatsByUserID(id: $id) {
-      _id
       creator {
         _id
         firstName
@@ -325,12 +169,6 @@ export const DIRECT_CHATS_LIST = gql`
         _id
         createdAt
         messageContent
-        receiver {
-          _id
-          firstName
-          lastName
-          email
-        }
         sender {
           _id
           firstName
@@ -353,42 +191,6 @@ export const DIRECT_CHATS_LIST = gql`
   }
 `;
 
-export const GROUP_CHAT_LIST = gql`
-  query GroupChatsByUserID($id: ID!) {
-    groupChatsByUserId(id: $id) {
-      _id
-      creator {
-        _id
-        firstName
-        lastName
-        email
-      }
-      title
-      messages {
-        _id
-        createdAt
-        messageContent
-        sender {
-          _id
-          firstName
-          lastName
-          email
-        }
-      }
-      organization {
-        _id
-        name
-      }
-      users {
-        _id
-        firstName
-        lastName
-        email
-        image
-      }
-    }
-  }
-`;
 /**
  * GraphQL query to check if an organization is a sample organization.
  *
diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
index c3999ba00e..93f40f9e40 100644
--- a/src/GraphQl/Queries/Queries.ts
+++ b/src/GraphQl/Queries/Queries.ts
@@ -800,7 +800,6 @@ export { AGENDA_ITEM_CATEGORY_LIST } from './AgendaCategoryQueries';
 // to take the list of the blocked users
 export {
   ADVERTISEMENTS_GET,
-  DIRECT_CHATS_LIST,
   IS_SAMPLE_ORGANIZATION_QUERY,
   ORGANIZATION_CUSTOM_FIELDS,
   ORGANIZATION_EVENTS_CONNECTION,
diff --git a/src/components/UserPortal/ChatRoom/ChatRoom.tsx b/src/components/UserPortal/ChatRoom/ChatRoom.tsx
index fab96322b3..e41cc98ca2 100644
--- a/src/components/UserPortal/ChatRoom/ChatRoom.tsx
+++ b/src/components/UserPortal/ChatRoom/ChatRoom.tsx
@@ -115,7 +115,6 @@ export default function chatRoom(props: InterfaceChatRoomProps): JSX.Element {
       chatId: props.selectedContact,
       replyTo: replyToDirectMessage?._id,
       messageContent: newMessage,
-      type: 'STRING',
     },
   });
 
diff --git a/src/components/UserPortal/CreateGroupChat/CreateGroupChat.test.tsx b/src/components/UserPortal/CreateGroupChat/CreateGroupChat.test.tsx
index fda0594b01..7eeaeacac1 100644
--- a/src/components/UserPortal/CreateGroupChat/CreateGroupChat.test.tsx
+++ b/src/components/UserPortal/CreateGroupChat/CreateGroupChat.test.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import {
   act,
   fireEvent,
-  prettyDOM,
   render,
   screen,
   waitFor,
@@ -12,7 +11,6 @@ import { MockedProvider } from '@apollo/react-testing';
 import { I18nextProvider } from 'react-i18next';
 
 import {
-  DIRECT_CHATS_LIST,
   USERS_CONNECTION_LIST,
   USER_JOINED_ORGANIZATIONS,
 } from 'GraphQl/Queries/Queries';
@@ -20,22 +18,12 @@ import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { store } from 'state/store';
 import i18nForTest from 'utils/i18nForTest';
-import { StaticMockLink } from 'utils/StaticMockLink';
 import Chat from '../../../screens/UserPortal/Chat/Chat';
 import {
   CREATE_CHAT,
-  CREATE_GROUP_CHAT,
   MESSAGE_SENT_TO_CHAT,
-  MESSAGE_SENT_TO_DIRECT_CHAT,
-  MESSAGE_SENT_TO_GROUP_CHAT,
 } from 'GraphQl/Mutations/OrganizationMutations';
-import {
-  CHATS_LIST,
-  CHAT_BY_ID,
-  DIRECT_CHAT_BY_ID,
-  GROUP_CHAT_BY_ID,
-  GROUP_CHAT_LIST,
-} from 'GraphQl/Queries/PlugInQueries';
+import { CHATS_LIST, CHAT_BY_ID } from 'GraphQl/Queries/PlugInQueries';
 import useLocalStorage from 'utils/useLocalstorage';
 import userEvent from '@testing-library/user-event';
 
@@ -2240,7 +2228,7 @@ describe('Testing Create Group Chat Modal [User Portal]', () => {
     })),
   });
 
-  test('Test open and close create new direct chat modal', async () => {
+  test('open and close create new direct chat modal', async () => {
     const mock = [
       ...USER_JOINED_ORG_MOCK,
       ...GROUP_CHAT_BY_ID_QUERY_MOCK,
@@ -2278,7 +2266,7 @@ describe('Testing Create Group Chat Modal [User Portal]', () => {
     fireEvent.click(closeButton);
   });
 
-  test('Test create new group chat', async () => {
+  test('create new group chat', async () => {
     const mock = [
       ...USER_JOINED_ORG_MOCK,
       ...GROUP_CHAT_BY_ID_QUERY_MOCK,
@@ -2378,7 +2366,7 @@ describe('Testing Create Group Chat Modal [User Portal]', () => {
     // });
   }, 3000);
 
-  test('Test add and remove user ', async () => {
+  test('add and remove user', async () => {
     setItem('userId', '1');
     const mock = [
       ...USER_JOINED_ORG_MOCK,
diff --git a/src/screens/UserPortal/Chat/Chat.test.tsx b/src/screens/UserPortal/Chat/Chat.test.tsx
index 900edecc36..d5e8049687 100644
--- a/src/screens/UserPortal/Chat/Chat.test.tsx
+++ b/src/screens/UserPortal/Chat/Chat.test.tsx
@@ -893,69 +893,6 @@ const CHAT_BY_ID_QUERY_MOCK = [
   },
 ];
 
-const MESSAGE_SENT_TO_GROUP_CHAT_MOCK = [
-  {
-    request: {
-      query: CHAT_BY_ID,
-      variables: {
-        id: '',
-      },
-    },
-    result: {
-      data: {
-        chatById: {
-          _id: '1',
-          isGroup: false,
-          creator: {
-            _id: '64378abd85008f171cf2990d',
-            firstName: 'Wilt',
-            lastName: 'Shepherd',
-            image: null,
-            email: 'testsuperadmin@example.com',
-            createdAt: '2023-04-13T04:53:17.742Z',
-            __typename: 'User',
-          },
-          organization: null,
-          name: '',
-          createdAt: '2345678903456',
-          messages: [
-            {
-              _id: '345678',
-              createdAt: '345678908765',
-              messageContent: 'Hello',
-              replyTo: null,
-              type: 'STRING',
-              sender: {
-                _id: '2',
-                firstName: 'Test',
-                lastName: 'User',
-                email: 'test@example.com',
-                image: '',
-              },
-            },
-          ],
-          users: [
-            {
-              _id: '1',
-              firstName: 'Disha',
-              lastName: 'Talreja',
-              email: 'disha@example.com',
-              image: '',
-            },
-            {
-              _id: '2',
-              firstName: 'Test',
-              lastName: 'User',
-              email: 'test@example.com',
-              image: '',
-            },
-          ],
-        },
-      },
-    },
-  },
-];
-
 const CHATS_LIST_MOCK = [
   {
     request: {