diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/index.ts b/app/client/packages/design-system/widgets/src/components/AIChat/index.ts
deleted file mode 100644
index 3bd16e178a03..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./src";
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/AIChat.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/src/AIChat.tsx
deleted file mode 100644
index d6975d9750a2..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/AIChat.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Button, Text, TextArea } from "@appsmith/wds";
-import type { FormEvent, ForwardedRef, KeyboardEvent } from "react";
-import React, { forwardRef, useCallback } from "react";
-import { ChatTitle } from "./ChatTitle";
-import styles from "./styles.module.css";
-import { ThreadMessage } from "./ThreadMessage";
-import type { AIChatProps, ChatMessage } from "./types";
-import { UserAvatar } from "./UserAvatar";
-
-const MIN_PROMPT_LENGTH = 3;
-
-const _AIChat = (props: AIChatProps, ref: ForwardedRef<HTMLDivElement>) => {
-  const {
-    // assistantName,
-    chatTitle,
-    isWaitingForResponse = false,
-    onPromptChange,
-    onSubmit,
-    prompt,
-    promptInputPlaceholder,
-    thread,
-    username,
-    ...rest
-  } = props;
-
-  const handleFormSubmit = useCallback(
-    (event: FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-      onSubmit?.();
-    },
-    [onSubmit],
-  );
-
-  const handlePromptInputKeyDown = useCallback(
-    (event: KeyboardEvent<HTMLTextAreaElement>) => {
-      if (event.key === "Enter" && event.shiftKey) {
-        event.preventDefault();
-        onSubmit?.();
-      }
-    },
-    [onSubmit],
-  );
-
-  return (
-    <div className={styles.root} ref={ref} {...rest}>
-      <div className={styles.header}>
-        <ChatTitle title={chatTitle} />
-
-        <div className={styles.username}>
-          <UserAvatar username={username} />
-          <Text data-testid="t--aichat-username" size="body">
-            {username}
-          </Text>
-        </div>
-      </div>
-
-      <ul className={styles.thread} data-testid="t--aichat-thread">
-        {thread.map((message: ChatMessage) => (
-          <ThreadMessage {...message} key={message.id} username={username} />
-        ))}
-      </ul>
-
-      <form className={styles.promptForm} onSubmit={handleFormSubmit}>
-        <TextArea
-          // TODO: Handle isWaitingForResponse: true state
-          isDisabled={isWaitingForResponse}
-          name="prompt"
-          onChange={onPromptChange}
-          onKeyDown={handlePromptInputKeyDown}
-          placeholder={promptInputPlaceholder}
-          value={prompt}
-        />
-        <Button isDisabled={prompt.length < MIN_PROMPT_LENGTH} type="submit">
-          Send
-        </Button>
-      </form>
-    </div>
-  );
-};
-
-export const AIChat = forwardRef(_AIChat);
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/ChatTitle.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/ChatTitle.tsx
deleted file mode 100644
index 2819d3523144..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/ChatTitle.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { clsx } from "clsx";
-import React from "react";
-import styles from "./styles.module.css";
-import type { ChatTitleProps } from "./types";
-
-export const ChatTitle = ({ className, title, ...rest }: ChatTitleProps) => {
-  return (
-    <div
-      className={clsx(styles.root, className)}
-      {...rest}
-      data-testid="t--aichat-chat-title"
-    >
-      <div className={styles.logo} />
-      {title}
-    </div>
-  );
-};
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/index.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/index.ts
deleted file mode 100644
index 78b61712de79..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./ChatTitle";
-export * from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/styles.module.css b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/styles.module.css
deleted file mode 100644
index a952c30dbf76..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/styles.module.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.root {
-  display: flex;
-  gap: 12px;
-  align-items: center;
-  /* TODO: --type-title doesn't exists. Define it */
-  font-size: var(--type-title, 22.499px);
-  font-style: normal;
-  font-weight: 500;
-  /* TODO: --type-title-lineheight doesn't exists. Define it */
-  line-height: var(--type-title-lineheight, 31.7px);
-}
-
-.logo {
-  display: inline-block;
-  width: 48px;
-  min-width: 48px;
-  height: 48px;
-  border-radius: 8px;
-  /* TODO: --bd-neutral doesn't exists. Define it */
-  border: 1px solid var(--bd-neutral, #81858b);
-  background: #f8f8f8;
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/types.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/types.ts
deleted file mode 100644
index 220bbc4efa72..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { HTMLProps } from "react";
-
-export interface ChatTitleProps extends HTMLProps<HTMLDivElement> {
-  title?: string;
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/ThreadMessage.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/ThreadMessage.tsx
deleted file mode 100644
index 37ea1f1c7923..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/ThreadMessage.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Text } from "@appsmith/wds";
-import { clsx } from "clsx";
-import React from "react";
-import Markdown from "react-markdown";
-import SyntaxHighlighter from "react-syntax-highlighter";
-import { monokai } from "react-syntax-highlighter/dist/cjs/styles/hljs";
-import { UserAvatar } from "../UserAvatar";
-import styles from "./styles.module.css";
-import type { ThreadMessageProps } from "./types";
-
-export const ThreadMessage = ({
-  className,
-  content,
-  isAssistant,
-  username,
-  ...rest
-}: ThreadMessageProps) => {
-  return (
-    <li
-      className={clsx(styles.root, className)}
-      data-assistant={isAssistant}
-      {...rest}
-    >
-      {isAssistant ? (
-        <div>
-          <Text className={styles.content}>
-            <Markdown
-              // eslint-disable-next-line react-perf/jsx-no-new-object-as-prop
-              components={{
-                code(props) {
-                  const { children, className, ...rest } = props;
-                  const match = /language-(\w+)/.exec(className ?? "");
-
-                  return match ? (
-                    <SyntaxHighlighter
-                      PreTag="div"
-                      language={match[1]}
-                      style={monokai}
-                    >
-                      {String(children).replace(/\n$/, "")}
-                    </SyntaxHighlighter>
-                  ) : (
-                    <code {...rest} className={className}>
-                      {children}
-                    </code>
-                  );
-                },
-              }}
-            >
-              {content}
-            </Markdown>
-          </Text>
-        </div>
-      ) : (
-        <>
-          <UserAvatar className={styles.userAvatar} username={username} />
-          <div>
-            <Text className={styles.content}>{content}</Text>
-          </div>
-        </>
-      )}
-    </li>
-  );
-};
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/index.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/index.ts
deleted file mode 100644
index 9916fbd0d566..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./ThreadMessage";
-export * from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/styles.module.css b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/styles.module.css
deleted file mode 100644
index e8081ecad004..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/styles.module.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.root {
-  display: flex;
-  gap: 16px;
-  padding: 12px 0;
-}
-
-@container (min-width: 700px) {
-  .root {
-    padding: 24px 0;
-  }
-}
-
-.root[data-assistant="false"] {
-  flex-direction: row-reverse;
-}
-
-.root[data-assistant="false"] .sentTime {
-  text-align: right;
-}
-
-.sentTime {
-  margin: 0 0 8px;
-  /* TODO: --type-caption doesn't exists. Define it */
-  font-size: var(--type-caption, 12.247px);
-  /* TODO: --type-caption-lineheight doesn't exists. Define it */
-  line-height: var(--type-caption-lineheight, 17.25px);
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/types.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/types.ts
deleted file mode 100644
index 8935dfe1e5c4..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { HTMLProps } from "react";
-
-export interface ThreadMessageProps extends HTMLProps<HTMLLIElement> {
-  content: string;
-  isAssistant: boolean;
-  username: string;
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/UserAvatar.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/UserAvatar.tsx
deleted file mode 100644
index 2c1667a4f22b..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/UserAvatar.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { clsx } from "clsx";
-import React from "react";
-import styles from "./styles.module.css";
-import type { UserAvatarProps } from "./types";
-
-export const UserAvatar = ({
-  className,
-  username,
-  ...rest
-}: UserAvatarProps) => {
-  const getNameInitials = (username: string) => {
-    const names = username.split(" ");
-
-    // If there is only one name, return the first character of the name.
-    if (names.length === 1) {
-      return `${names[0].charAt(0)}`;
-    }
-
-    return `${names[0].charAt(0)}${names[1]?.charAt(0)}`;
-  };
-
-  return (
-    <span className={clsx(styles.root, className)} {...rest}>
-      {getNameInitials(username)}
-    </span>
-  );
-};
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/index.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/index.ts
deleted file mode 100644
index ee08802f33b5..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./UserAvatar";
-export * from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/styles.module.css b/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/styles.module.css
deleted file mode 100644
index b11f3896efca..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/styles.module.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.root {
-  display: inline-block;
-  width: 28px;
-  min-width: 28px;
-  height: 28px;
-  color: var(--bg-elevation-2, #fff);
-  text-align: center;
-  font-size: 14px;
-  font-weight: 500;
-  line-height: 28px;
-  border-radius: var(--inner-spacing-1, 4px);
-  background: #000;
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/types.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/types.ts
deleted file mode 100644
index 493da46824f5..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/UserAvatar/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { HTMLProps } from "react";
-
-export interface UserAvatarProps extends HTMLProps<HTMLSpanElement> {
-  username: string;
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/index.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/index.ts
deleted file mode 100644
index a2b07d66147a..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./types";
-export { AIChat } from "./AIChat";
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/AIChat/src/styles.module.css
deleted file mode 100644
index 3c0780cf6209..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/styles.module.css
+++ /dev/null
@@ -1,48 +0,0 @@
-.root {
-  width: 100%;
-  border-radius: var(--border-radius-elevation-1);
-  border: 1px solid var(--color-bd-elevation-1);
-  /* TODO: --bg-elevation-1 doesn't exists. Define it */
-  background: var(--bg-elevation-1, #fbfcfd);
-}
-
-.header {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  padding: 22px 40px;
-  align-items: flex-start;
-  border-bottom: 1px solid var(--color-bd-elevation-1);
-  background: rgba(255, 255, 255, 0.45);
-}
-
-@container (min-width: 700px) {
-  .header {
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
-}
-
-.username {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.thread {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  align-self: stretch;
-  padding: 0px 40px var(--inner-spacing-5) 40px;
-}
-
-.promptForm {
-  display: flex;
-  align-items: flex-start;
-  margin: var(--outer-spacing-4) 0 0 0;
-  padding: 0 var(--inner-spacing-5) var(--inner-spacing-5)
-    var(--inner-spacing-5);
-  gap: var(--outer-spacing-3);
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/types.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/types.ts
deleted file mode 100644
index 69572c5d6f83..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/src/types.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export interface ChatMessage {
-  id: string;
-  content: string;
-  isAssistant: boolean;
-}
-
-export interface AIChatProps {
-  thread: ChatMessage[];
-  prompt: string;
-  username: string;
-  promptInputPlaceholder?: string;
-  chatTitle?: string;
-  chatDescription?: string;
-  assistantName?: string;
-  isWaitingForResponse?: boolean;
-  onPromptChange: (prompt: string) => void;
-  onSubmit?: () => void;
-}
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/stories/AIChat.stories.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/stories/AIChat.stories.tsx
deleted file mode 100644
index 6b0abe2853bf..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/stories/AIChat.stories.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { AIChat } from "@appsmith/wds";
-import type { Meta, StoryObj } from "@storybook/react";
-
-const meta: Meta<typeof AIChat> = {
-  component: AIChat,
-  title: "WDS/Widgets/AIChat",
-};
-
-export default meta;
-type Story = StoryObj<typeof AIChat>;
-
-export const Main: Story = {
-  args: {
-    thread: [],
-    prompt: "",
-    username: "John Doe",
-    promptInputPlaceholder: "Type your message here",
-    chatTitle: "Chat with Assistant",
-    assistantName: "",
-    isWaitingForResponse: false,
-  },
-};
-
-export const EmptyHistory: Story = {
-  args: {
-    thread: [],
-    prompt: "",
-    username: "John Doe",
-    promptInputPlaceholder: "Type your message here",
-    chatTitle: "Chat with Assistant",
-  },
-};
-
-export const Loading: Story = {
-  args: {
-    thread: [],
-    prompt: "",
-    username: "John Doe",
-    promptInputPlaceholder: "Type your message here",
-    chatTitle: "Chat with Assistant",
-    isWaitingForResponse: true,
-  },
-};
-
-export const WithHistory: Story = {
-  args: {
-    thread: [
-      {
-        id: "1",
-        content: "Hi, how can I help you?",
-        isAssistant: true,
-      },
-      {
-        id: "2",
-        content: "Find stuck support requests",
-        isAssistant: false,
-      },
-      {
-        id: "3",
-        content: `Certainly! Here's what I can do to help you:
-* Search our customers database
-* Find stuck support requests
-* Provide advice on how to resolve customer issues
-`,
-        isAssistant: true,
-      },
-      {
-        id: "4",
-        content: "Thank you",
-        isAssistant: false,
-      },
-    ],
-    prompt: "",
-    username: "John Doe",
-    promptInputPlaceholder: "Type your message here",
-    chatTitle: "Chat with Assistant",
-  },
-};
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/tests/AIChat.test.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/tests/AIChat.test.tsx
deleted file mode 100644
index ce868dd72c7e..000000000000
--- a/app/client/packages/design-system/widgets/src/components/AIChat/tests/AIChat.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React from "react";
-import "@testing-library/jest-dom";
-import { render, screen, within } from "@testing-library/react";
-import { faker } from "@faker-js/faker";
-
-import { AIChat, type AIChatProps } from "..";
-import userEvent from "@testing-library/user-event";
-
-const renderComponent = (props: Partial<AIChatProps> = {}) => {
-  const defaultProps: AIChatProps = {
-    username: "",
-    thread: [],
-    prompt: "",
-    onPromptChange: jest.fn(),
-  };
-
-  return render(<AIChat {...defaultProps} {...props} />);
-};
-
-describe("@appsmith/wds/AIChat", () => {
-  it("should render chat's title", () => {
-    const chatTitle = faker.lorem.words(2);
-
-    renderComponent({ chatTitle });
-
-    expect(screen.getByTestId("t--aichat-chat-title")).toHaveTextContent(
-      chatTitle,
-    );
-  });
-
-  it("should render username", () => {
-    const username = faker.name.firstName();
-
-    renderComponent({ username });
-
-    expect(screen.getByTestId("t--aichat-username")).toHaveTextContent(
-      username,
-    );
-  });
-
-  it("should render thread", () => {
-    const thread = [
-      {
-        id: faker.datatype.uuid(),
-        content: faker.lorem.paragraph(1),
-        isAssistant: false,
-      },
-      {
-        id: faker.datatype.uuid(),
-        content: faker.lorem.paragraph(2),
-        isAssistant: true,
-      },
-    ];
-
-    renderComponent({ thread });
-
-    const messages = within(
-      screen.getByTestId("t--aichat-thread"),
-    ).getAllByRole("listitem");
-
-    expect(messages).toHaveLength(thread.length);
-    expect(messages[0]).toHaveTextContent(thread[0].content);
-    expect(messages[1]).toHaveTextContent(thread[1].content);
-  });
-
-  it("should render prompt input placeholder", () => {
-    const promptInputPlaceholder = faker.lorem.words(3);
-
-    renderComponent({
-      promptInputPlaceholder,
-    });
-
-    expect(screen.getByRole("textbox")).toHaveAttribute(
-      "placeholder",
-      promptInputPlaceholder,
-    );
-  });
-
-  it("should render prompt input value", () => {
-    const prompt = faker.lorem.words(3);
-
-    renderComponent({
-      prompt,
-    });
-
-    expect(screen.getByRole("textbox")).toHaveValue(prompt);
-  });
-
-  it("should trigger user's prompt", async () => {
-    const onPromptChange = jest.fn();
-
-    renderComponent({
-      onPromptChange,
-    });
-
-    await userEvent.type(screen.getByRole("textbox"), "A");
-
-    expect(onPromptChange).toHaveBeenCalledWith("A");
-  });
-
-  it("should submit user's prompt", async () => {
-    const onSubmit = jest.fn();
-
-    renderComponent({
-      prompt: "ABCD",
-      onSubmit,
-    });
-
-    await userEvent.click(screen.getByRole("button", { name: "Send" }));
-
-    expect(onSubmit).toHaveBeenCalled();
-  });
-});
diff --git a/app/client/packages/design-system/widgets/src/index.ts b/app/client/packages/design-system/widgets/src/index.ts
index 06aafcc9422c..5f3084079042 100644
--- a/app/client/packages/design-system/widgets/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/index.ts
@@ -1,4 +1,3 @@
-export * from "./components/AIChat";
 export * from "./components/Icon";
 export * from "./components/Button";
 export * from "./components/IconButton";
diff --git a/app/client/src/ce/widgets/index.ts b/app/client/src/ce/widgets/index.ts
new file mode 100644
index 000000000000..098751c5a106
--- /dev/null
+++ b/app/client/src/ce/widgets/index.ts
@@ -0,0 +1,196 @@
+import AudioRecorderWidget from "../../widgets/AudioRecorderWidget";
+import AudioWidget from "../../widgets/AudioWidget";
+import ButtonGroupWidget from "../../widgets/ButtonGroupWidget";
+import ButtonWidget from "../../widgets/ButtonWidget";
+import SelectWidget from "../../widgets/SelectWidget";
+import CameraWidget from "../../widgets/CameraWidget";
+import CanvasWidget from "../../widgets/CanvasWidget";
+import ChartWidget from "../../widgets/ChartWidget";
+import CheckboxGroupWidget from "../../widgets/CheckboxGroupWidget";
+import CheckboxWidget from "../../widgets/CheckboxWidget";
+import CircularProgressWidget from "../../widgets/CircularProgressWidget";
+import ContainerWidget from "../../widgets/ContainerWidget";
+import CurrencyInputWidget from "../../widgets/CurrencyInputWidget";
+import DatePickerWidget from "../../widgets/DatePickerWidget";
+import DatePickerWidget2 from "../../widgets/DatePickerWidget2";
+import DividerWidget from "../../widgets/DividerWidget";
+import MultiSelectWidgetV2 from "../../widgets/MultiSelectWidgetV2";
+import DocumentViewerWidget from "../../widgets/DocumentViewerWidget";
+import DropdownWidget from "../../widgets/DropdownWidget";
+import FilePickerWidget from "../../widgets/FilepickerWidget";
+import FilePickerWidgetV2 from "../../widgets/FilePickerWidgetV2";
+import FormButtonWidget from "../../widgets/FormButtonWidget";
+import FormWidget from "../../widgets/FormWidget";
+import IconButtonWidget from "../../widgets/IconButtonWidget";
+import IconWidget from "../../widgets/IconWidget";
+import IframeWidget from "../../widgets/IframeWidget";
+import ImageWidget from "../../widgets/ImageWidget";
+import InputWidget from "../../widgets/InputWidget";
+import InputWidgetV2 from "../../widgets/InputWidgetV2";
+import ListWidget from "../../widgets/ListWidget";
+import MapChartWidget from "../../widgets/MapChartWidget";
+import MapWidget from "../../widgets/MapWidget";
+import MenuButtonWidget from "../../widgets/MenuButtonWidget";
+import ModalWidget from "../../widgets/ModalWidget";
+import MultiSelectTreeWidget from "../../widgets/MultiSelectTreeWidget";
+import MultiSelectWidget from "../../widgets/MultiSelectWidget";
+import PhoneInputWidget from "../../widgets/PhoneInputWidget";
+import ProgressBarWidget from "../../widgets/ProgressBarWidget";
+import RadioGroupWidget from "../../widgets/RadioGroupWidget";
+import RateWidget from "../../widgets/RateWidget";
+import RichTextEditorWidget from "../../widgets/RichTextEditorWidget";
+import SingleSelectTreeWidget from "../../widgets/SingleSelectTreeWidget";
+import SkeletonWidget from "../../widgets/SkeletonWidget";
+import StatboxWidget from "../../widgets/StatboxWidget";
+import JSONFormWidget from "../../widgets/JSONFormWidget";
+import SwitchGroupWidget from "../../widgets/SwitchGroupWidget";
+import SwitchWidget from "../../widgets/SwitchWidget";
+import TableWidget from "../../widgets/TableWidget";
+import TabsMigratorWidget from "../../widgets/TabsMigrator";
+import TabsWidget from "../../widgets/TabsWidget";
+import TextWidget from "../../widgets/TextWidget";
+import VideoWidget from "../../widgets/VideoWidget";
+import ProgressWidget from "../../widgets/ProgressWidget";
+import TableWidgetV2 from "../../widgets/TableWidgetV2";
+import NumberSliderWidget from "../../widgets/NumberSliderWidget";
+import RangeSliderWidget from "../../widgets/RangeSliderWidget";
+import CategorySliderWidget from "../../widgets/CategorySliderWidget";
+import CodeScannerWidget from "../../widgets/CodeScannerWidget";
+import ListWidgetV2 from "../../widgets/ListWidgetV2";
+import { WDSButtonWidget } from "modules/ui-builder/ui/wds/WDSButtonWidget";
+import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget";
+import { WDSCheckboxWidget } from "modules/ui-builder/ui/wds/WDSCheckboxWidget";
+import { WDSIconButtonWidget } from "modules/ui-builder/ui/wds/WDSIconButtonWidget";
+import type BaseWidget from "../../widgets/BaseWidget";
+import ExternalWidget from "../../widgets/ExternalWidget";
+import { WDSTableWidget } from "modules/ui-builder/ui/wds/WDSTableWidget";
+import { WDSCurrencyInputWidget } from "modules/ui-builder/ui/wds/WDSCurrencyInputWidget";
+import { WDSToolbarButtonsWidget } from "modules/ui-builder/ui/wds/WDSToolbarButtonsWidget";
+import { WDSPhoneInputWidget } from "modules/ui-builder/ui/wds/WDSPhoneInputWidget";
+import { WDSCheckboxGroupWidget } from "modules/ui-builder/ui/wds/WDSCheckboxGroupWidget";
+import { WDSComboBoxWidget } from "modules/ui-builder/ui/wds/WDSComboBoxWidget";
+import { WDSSwitchWidget } from "modules/ui-builder/ui/wds/WDSSwitchWidget";
+import { WDSSwitchGroupWidget } from "modules/ui-builder/ui/wds/WDSSwitchGroupWidget";
+import { WDSRadioGroupWidget } from "modules/ui-builder/ui/wds/WDSRadioGroupWidget";
+import { WDSMenuButtonWidget } from "modules/ui-builder/ui/wds/WDSMenuButtonWidget";
+import CustomWidget from "../../widgets/CustomWidget";
+import { WDSSectionWidget } from "modules/ui-builder/ui/wds/WDSSectionWidget";
+import { WDSZoneWidget } from "modules/ui-builder/ui/wds/WDSZoneWidget";
+import { WDSHeadingWidget } from "modules/ui-builder/ui/wds/WDSHeadingWidget";
+import { WDSParagraphWidget } from "modules/ui-builder/ui/wds/WDSParagraphWidget";
+import { WDSModalWidget } from "modules/ui-builder/ui/wds/WDSModalWidget";
+import { WDSStatsWidget } from "modules/ui-builder/ui/wds/WDSStatsWidget";
+import { WDSKeyValueWidget } from "modules/ui-builder/ui/wds/WDSKeyValueWidget";
+import { WDSInlineButtonsWidget } from "modules/ui-builder/ui/wds/WDSInlineButtonsWidget";
+import { WDSEmailInputWidget } from "modules/ui-builder/ui/wds/WDSEmailInputWidget";
+import { WDSPasswordInputWidget } from "modules/ui-builder/ui/wds/WDSPasswordInputWidget";
+import { WDSNumberInputWidget } from "modules/ui-builder/ui/wds/WDSNumberInputWidget";
+import { WDSMultilineInputWidget } from "modules/ui-builder/ui/wds/WDSMultilineInputWidget";
+import { WDSSelectWidget } from "modules/ui-builder/ui/wds/WDSSelectWidget";
+
+const LegacyWidgets = [
+  CanvasWidget,
+  SkeletonWidget,
+  ContainerWidget,
+  TextWidget,
+  TableWidget,
+  CheckboxWidget,
+  RadioGroupWidget,
+  ButtonWidget,
+  ImageWidget,
+  VideoWidget,
+  TabsWidget,
+  ModalWidget,
+  ChartWidget,
+  MapWidget,
+  RichTextEditorWidget,
+  DatePickerWidget2,
+  SwitchWidget,
+  FormWidget,
+  RateWidget,
+  IframeWidget,
+  TabsMigratorWidget,
+  DividerWidget,
+  MenuButtonWidget,
+  IconButtonWidget,
+  CheckboxGroupWidget,
+  FilePickerWidgetV2,
+  StatboxWidget,
+  AudioRecorderWidget,
+  DocumentViewerWidget,
+  ButtonGroupWidget,
+  MultiSelectTreeWidget,
+  SingleSelectTreeWidget,
+  SwitchGroupWidget,
+  AudioWidget,
+  ProgressBarWidget,
+  CameraWidget,
+  MapChartWidget,
+  SelectWidget,
+  MultiSelectWidgetV2,
+  InputWidgetV2,
+  PhoneInputWidget,
+  CurrencyInputWidget,
+  JSONFormWidget,
+  TableWidgetV2,
+  NumberSliderWidget,
+  RangeSliderWidget,
+  CategorySliderWidget,
+  CodeScannerWidget,
+  ListWidgetV2,
+  ExternalWidget,
+];
+
+const DeprecatedWidgets = [
+  //Deprecated Widgets
+  InputWidget,
+  DropdownWidget,
+  DatePickerWidget,
+  IconWidget,
+  FilePickerWidget,
+  MultiSelectWidget,
+  FormButtonWidget,
+  ProgressWidget,
+  CircularProgressWidget,
+  ListWidget,
+];
+
+const WDSWidgets = [
+  // WDS Widgets
+  WDSButtonWidget,
+  WDSInputWidget,
+  WDSCheckboxWidget,
+  WDSIconButtonWidget,
+  WDSTableWidget,
+  WDSCurrencyInputWidget,
+  WDSToolbarButtonsWidget,
+  WDSPhoneInputWidget,
+  WDSCheckboxGroupWidget,
+  WDSComboBoxWidget,
+  WDSSwitchWidget,
+  WDSSwitchGroupWidget,
+  WDSRadioGroupWidget,
+  WDSMenuButtonWidget,
+  CustomWidget,
+  WDSSectionWidget,
+  WDSZoneWidget,
+  WDSParagraphWidget,
+  WDSHeadingWidget,
+  WDSModalWidget,
+  WDSStatsWidget,
+  WDSKeyValueWidget,
+  WDSInlineButtonsWidget,
+  WDSEmailInputWidget,
+  WDSPasswordInputWidget,
+  WDSNumberInputWidget,
+  WDSMultilineInputWidget,
+  WDSSelectWidget,
+];
+
+const Widgets = [
+  ...WDSWidgets,
+  ...DeprecatedWidgets,
+  ...LegacyWidgets,
+] as (typeof BaseWidget)[];
+
+export default Widgets;
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/index.tsx
deleted file mode 100644
index 99a42a9692a5..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import WDSAIChatWidget from "./widget";
-
-export { WDSAIChatWidget };
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/anvilConfig.ts
deleted file mode 100644
index dc7fe21e103c..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/anvilConfig.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { AnvilConfig } from "WidgetProvider/constants";
-
-export const anvilConfig: AnvilConfig = {
-  isLargeWidget: false,
-  widgetSize: {
-    minWidth: {
-      base: "100%",
-      "180px": "sizing-30",
-    },
-  },
-};
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/autocompleteConfig.ts
deleted file mode 100644
index 26579c80b836..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/autocompleteConfig.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
-
-export const autocompleteConfig = {
-  isVisible: DefaultAutocompleteDefinitions.isVisible,
-};
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/defaultConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/defaultConfig.ts
deleted file mode 100644
index 6d618658a411..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/defaultConfig.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
-import type { WidgetDefaultProps } from "WidgetProvider/constants";
-
-export const defaultsConfig = {
-  isVisible: true,
-  widgetName: "AIChat",
-  widgetType: "AI_CHAT",
-  version: 1,
-  responsiveBehavior: ResponsiveBehavior.Fill,
-} as unknown as WidgetDefaultProps;
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/index.ts
deleted file mode 100644
index fdf9289d5f4d..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { anvilConfig } from "./anvilConfig";
-import { metaConfig } from "./metaConfig";
-import { defaultsConfig } from "./defaultConfig";
-import { propertyPaneContent } from "./propertyPaneContent";
-import { propertyPaneStyle } from "./propertyPaneStyle";
-import { methodsConfig } from "./methodsConfig";
-import { autocompleteConfig } from "./autocompleteConfig";
-
-export {
-  anvilConfig,
-  metaConfig,
-  defaultsConfig,
-  propertyPaneContent,
-  propertyPaneStyle,
-  methodsConfig,
-  autocompleteConfig,
-};
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/metaConfig.ts
deleted file mode 100644
index 1b94379578db..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/metaConfig.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { WIDGET_TAGS } from "constants/WidgetConstants";
-import type { WidgetBaseConfiguration } from "WidgetProvider/constants";
-
-export const metaConfig: WidgetBaseConfiguration = {
-  name: "AIChat",
-  tags: [WIDGET_TAGS.CONTENT],
-  needsMeta: true,
-  searchTags: ["chat"],
-};
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/methodsConfig.ts
deleted file mode 100644
index 71de829ef47b..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/methodsConfig.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { AIChatIcon, AIChatThumbnail } from "appsmith-icons";
-
-export const methodsConfig = {
-  IconCmp: AIChatIcon,
-  ThumbnailCmp: AIChatThumbnail,
-};
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/propertyPaneContent.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/propertyPaneContent.ts
deleted file mode 100644
index ac4abc2c8b17..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/propertyPaneContent.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import { ValidationTypes } from "constants/WidgetValidation";
-
-export const propertyPaneContent = [
-  {
-    sectionName: "General",
-    children: [
-      {
-        helpText: "Select a query to submit when a chat message is sent.",
-        propertyName: "query",
-        label: "Query to trigger",
-        controlType: "INPUT_TEXT",
-        placeholderText: "Value",
-        isJSConvertible: false,
-        isBindProperty: false,
-        isTriggerProperty: false,
-        dependencies: ["queryData", "queryRun"],
-        updateHook: (
-          _props: unknown,
-          propertyPath: string,
-          propertyValue: string,
-        ) => {
-          const propertiesToUpdate = [{ propertyPath, propertyValue }];
-
-          propertiesToUpdate.push({
-            propertyPath: "queryData",
-            propertyValue: `{{${propertyValue}.data}}`,
-          });
-          propertiesToUpdate.push({
-            propertyPath: "queryRun",
-            propertyValue: propertyValue,
-          });
-
-          return propertiesToUpdate;
-        },
-      },
-      {
-        helpText: "Adds a header to the chat",
-        propertyName: "chatTitle",
-        label: "Title",
-        controlType: "INPUT_TEXT",
-        isJSConvertible: false,
-        isBindProperty: false,
-        isTriggerProperty: false,
-        validation: { type: ValidationTypes.TEXT },
-        defaultValue: "",
-      },
-      {
-        helpText:
-          "Adds a description to help users understand how to use the chat",
-        propertyName: "chatDescription",
-        label: "Description",
-        controlType: "INPUT_TEXT",
-        isJSConvertible: false,
-        isBindProperty: false,
-        isTriggerProperty: false,
-        validation: { type: ValidationTypes.TEXT },
-        defaultValue: "",
-      },
-      {
-        helpText: "Adds a placeholder text to the message input box",
-        propertyName: "promptInputPlaceholder",
-        label: "Placeholder",
-        controlType: "INPUT_TEXT",
-        isJSConvertible: false,
-        isBindProperty: false,
-        isTriggerProperty: false,
-        validation: { type: ValidationTypes.TEXT },
-        defaultValue: "",
-      },
-      {
-        helpText: "Gives the open AI Assistant a name to be displayed in chat",
-        propertyName: "assistantName",
-        label: "Assistant Name",
-        controlType: "INPUT_TEXT",
-        isJSConvertible: false,
-        isBindProperty: false,
-        isTriggerProperty: false,
-        validation: { type: ValidationTypes.TEXT },
-        defaultValue: "",
-      },
-      {
-        helpText: "Configures a prompt for the assistant",
-        propertyName: "systemPrompt",
-        label: "Prompt",
-        controlType: "INPUT_TEXT",
-        isJSConvertible: false,
-        isBindProperty: false,
-        isTriggerProperty: false,
-        validation: { type: ValidationTypes.TEXT },
-        defaultValue: "",
-      },
-      {
-        helpText: "Controls the visibility of the widget",
-        propertyName: "isVisible",
-        label: "Visible",
-        controlType: "SWITCH",
-        isJSConvertible: true,
-        isBindProperty: true,
-        isTriggerProperty: false,
-        validation: { type: ValidationTypes.BOOLEAN },
-        defaultValue: true,
-      },
-    ],
-  },
-  {
-    sectionName: "Hidden props",
-    children: [
-      {
-        propertyName: "queryData",
-        label: "",
-        controlType: "INPUT_TEXT",
-        isJSConvertible: true,
-        isBindProperty: true,
-        isTriggerProperty: false,
-        hidden: () => true,
-      },
-      {
-        propertyName: "queryRun",
-        label: "",
-        controlType: "INPUT_TEXT",
-        isJSConvertible: true,
-        isBindProperty: true,
-        isTriggerProperty: false,
-        hidden: () => true,
-      },
-      // Fake hidden prop to pass the username to the widget
-      {
-        propertyName: "username",
-        label: "",
-        controlType: "INPUT_TEXT",
-        defaultValue: "{{appsmith.user.username}}",
-        isJSConvertible: true,
-        isBindProperty: true,
-        isTriggerProperty: false,
-        hidden: () => true,
-        invisible: true,
-      },
-    ],
-  },
-];
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/propertyPaneStyle.ts b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/propertyPaneStyle.ts
deleted file mode 100644
index 090b16597cfa..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/config/propertyPaneStyle.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const propertyPaneStyle = [];
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/index.tsx
deleted file mode 100644
index f94fb5935f71..000000000000
--- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/index.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-import { AIChat, type ChatMessage } from "@appsmith/wds";
-import {
-  EventType,
-  type ExecutionResult,
-} from "constants/AppsmithActionConstants/ActionConstants";
-import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import React, { type FormEvent, type ReactNode } from "react";
-import type {
-  AnvilConfig,
-  AutocompletionDefinitions,
-  WidgetBaseConfiguration,
-  WidgetDefaultProps,
-} from "WidgetProvider/constants";
-import type { DerivedPropertiesMap } from "WidgetProvider/factory";
-import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
-import BaseWidget from "widgets/BaseWidget";
-import type { ContainerWidgetProps } from "widgets/ContainerWidget/widget";
-import {
-  anvilConfig,
-  autocompleteConfig,
-  defaultsConfig,
-  metaConfig,
-  methodsConfig,
-  propertyPaneContent,
-  propertyPaneStyle,
-} from "./config";
-
-export interface WDSAIChatWidgetProps
-  extends ContainerWidgetProps<WidgetProps> {}
-export interface Message {
-  id: string;
-  content: string;
-  role: "assistant" | "user" | "system";
-}
-
-interface State extends WidgetState {
-  messages: Message[];
-  prompt: string;
-  isWaitingForResponse: boolean;
-}
-
-class WDSAIChatWidget extends BaseWidget<WDSAIChatWidgetProps, State> {
-  static type = "WDS_AI_CHAT_WIDGET";
-
-  state = {
-    messages: [
-      {
-        id: "1",
-        content: "Hello! How can I help you?",
-        role: "assistant" as const,
-      },
-      {
-        id: "2",
-        content: "Find stuck support requests",
-        role: "user" as const,
-      },
-      {
-        id: "3",
-        content:
-          "I'm finding these customer support requests that have been waiting for a response for over a day:",
-        role: "assistant" as const,
-      },
-    ],
-    prompt: "",
-    isWaitingForResponse: false,
-  };
-
-  static getConfig(): WidgetBaseConfiguration {
-    return metaConfig;
-  }
-
-  static getDefaults(): WidgetDefaultProps {
-    return defaultsConfig;
-  }
-
-  static getPropertyPaneConfig() {
-    return [];
-  }
-  static getPropertyPaneContentConfig() {
-    return propertyPaneContent;
-  }
-
-  static getPropertyPaneStyleConfig() {
-    return propertyPaneStyle;
-  }
-
-  static getMethods() {
-    return methodsConfig;
-  }
-
-  static getAutocompleteDefinitions(): AutocompletionDefinitions {
-    return autocompleteConfig;
-  }
-
-  static getSetterConfig(): SetterConfig | null {
-    return {
-      __setters: {
-        setVisibility: {
-          path: "isVisible",
-          type: "boolean",
-        },
-      },
-    };
-  }
-
-  static getDerivedPropertiesMap(): DerivedPropertiesMap {
-    return {};
-  }
-
-  static getDefaultPropertiesMap(): Record<string, string> {
-    return {};
-  }
-
-  static getMetaPropertiesMap(): Record<string, unknown> {
-    return {};
-  }
-
-  static getAnvilConfig(): AnvilConfig | null {
-    return anvilConfig;
-  }
-
-  static getStylesheetConfig(): Stylesheet {
-    return {};
-  }
-
-  adaptMessages(messages: Message[]): ChatMessage[] {
-    return messages.map((message) => ({
-      ...message,
-      isAssistant: message.role === "assistant",
-    }));
-  }
-
-  handleMessageSubmit = (event?: FormEvent<HTMLFormElement>) => {
-    event?.preventDefault();
-
-    this.setState(
-      (state) => ({
-        messages: [
-          ...state.messages,
-          {
-            id: String(Date.now()),
-            content: this.state.prompt,
-            role: "user",
-          },
-        ],
-        prompt: "",
-        isWaitingForResponse: true,
-      }),
-      () => {
-        const messages: Message[] = [...this.state.messages];
-
-        if (this.props.systemPrompt) {
-          messages.unshift({
-            id: String(Date.now()),
-            content: this.props.systemPrompt,
-            role: "system",
-          });
-        }
-
-        const params = {
-          messages,
-        };
-
-        this.executeAction({
-          triggerPropertyName: "onClick",
-          dynamicString: `{{${this.props.queryRun}.run(${JSON.stringify(params)})}}`,
-          event: {
-            type: EventType.ON_CLICK,
-            callback: this.handleActionComplete,
-          },
-        });
-      },
-    );
-  };
-
-  handleActionComplete = (result: ExecutionResult) => {
-    if (result.success) {
-      this.setState((state) => ({
-        messages: [
-          ...state.messages,
-          {
-            id: Math.random().toString(),
-            content: this.props.queryData.choices[0].message.content,
-            role: "assistant",
-          },
-        ],
-        isWaitingForResponse: false,
-      }));
-    }
-  };
-
-  handlePromptChange = (prompt: string) => {
-    this.setState({ prompt });
-  };
-
-  getWidgetView(): ReactNode {
-    return (
-      <AIChat
-        assistantName={this.props.assistantName}
-        chatTitle={this.props.chatTitle}
-        isWaitingForResponse={this.state.isWaitingForResponse}
-        onPromptChange={this.handlePromptChange}
-        onSubmit={this.handleMessageSubmit}
-        prompt={this.state.prompt}
-        promptInputPlaceholder={this.props.promptInputPlaceholder}
-        thread={this.adaptMessages(this.state.messages)}
-        username={this.props.username || ""}
-      />
-    );
-  }
-}
-
-export default WDSAIChatWidget;
diff --git a/app/client/src/widgets/index.ts b/app/client/src/widgets/index.ts
index 23ca19c69347..f3d09da26f1f 100644
--- a/app/client/src/widgets/index.ts
+++ b/app/client/src/widgets/index.ts
@@ -57,7 +57,6 @@ import RangeSliderWidget from "./RangeSliderWidget";
 import CategorySliderWidget from "./CategorySliderWidget";
 import CodeScannerWidget from "./CodeScannerWidget";
 import ListWidgetV2 from "./ListWidgetV2";
-import { WDSAIChatWidget } from "modules/ui-builder/ui/wds/WDSAIChatWidget";
 import { WDSButtonWidget } from "modules/ui-builder/ui/wds/WDSButtonWidget";
 import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget";
 import { WDSCheckboxWidget } from "modules/ui-builder/ui/wds/WDSCheckboxWidget";
@@ -158,7 +157,6 @@ const DeprecatedWidgets = [
 
 const WDSWidgets = [
   // WDS Widgets
-  WDSAIChatWidget,
   WDSButtonWidget,
   WDSInputWidget,
   WDSCheckboxWidget,