diff --git a/client/components/UploadDocumentsForm.tsx b/client/components/UploadDocumentsForm.tsx
deleted file mode 100644
index de032ac2..00000000
--- a/client/components/UploadDocumentsForm.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-"use client";
-
-import { useState, type FormEvent } from "react";
-import DEFAULT_RETRIEVAL_TEXT from "@/data/DefaultRetrievalText";
-
-export function UploadDocumentsForm() {
-  const [isLoading, setIsLoading] = useState(false);
-  const [document, setDocument] = useState(DEFAULT_RETRIEVAL_TEXT);
-  const ingest = async (e: FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    setIsLoading(true);
-    const response = await fetch("/api/retrieval/ingest", {
-      method: "POST",
-      body: JSON.stringify({
-        text: document
-      })
-    });
-    if (response.status === 200) {
-      setDocument("Uploaded!");
-    } else {
-      const json = await response.json();
-      if (json.error) {
-        setDocument(json.error);
-      }
-    }
-    setIsLoading(false);
-  };
-  return (
-    <form onSubmit={ingest} className="flex w-full mb-4">
-    <textarea
-      className="grow mr-8 p-4 rounded"
-      value={document}
-      onChange={(e) => setDocument(e.target.value)}
-    ></textarea>
-    <button type="submit" className="shrink-0 px-8 py-4 bg-sky-600 rounded w-28">
-      <div role="status" className={`${isLoading ? "" : "hidden"} flex justify-center`}>
-        <svg aria-hidden="true" className="w-6 h-6 text-white animate-spin dark:text-white fill-sky-800" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-        </svg>
-        <span className="sr-only">Loading...</span>
-      </div>
-      <span className={isLoading ? "hidden" : ""}>Upload</span>
-    </button>
-  </form>
-  );
-}
\ No newline at end of file
diff --git a/client/components/chat/ChatMessageBubble.tsx b/client/components/chat/ChatMessageBubble.tsx
deleted file mode 100644
index ce5b41ea..00000000
--- a/client/components/chat/ChatMessageBubble.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Avatar } from '@nextui-org/react';
-import type { Message } from 'ai/react';
-import AudioPlayer from './AudioPlayer';
-
-export function ChatMessageBubble(props: {
-  message: Message;
-  sources: any[];
-  aiAvatar?: string;
-  aiName?: string;
-  voice?: string;
-}) {
-  const { voice = null } = props;
-  const colorClassName =
-    props.message.role === 'user' ? 'bg-[#d2e3fc]' : 'bg-slate-50 text-black';
-  const alignmentClassName =
-    props.message.role === 'user' ? 'ml-auto' : 'mr-auto';
-  const isBot = props.message.role === 'user' ? false : true;
-  return (
-    <div className="flex">
-      {isBot && (
-        <Avatar
-          src={props?.aiAvatar!}
-          className="mb-8 mr-4 w-8 h-8  text-large"
-          name={props?.aiName!}
-        />
-      )}
-      <div
-        className={`${alignmentClassName} ${colorClassName} rounded  px-4 py-2 max-w-[80%] mb-8 flex`}
-      >
-        <div className="whitespace-pre-wrap flex flex-col">
-          <span>{props.message.content}</span>
-          {voice && isBot && (
-            <AudioPlayer voice={voice} message={props.message.content} />
-          )}
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/client/components/chat/ChatWindow.tsx b/client/components/chat/ChatWindow.tsx
deleted file mode 100644
index e5bced90..00000000
--- a/client/components/chat/ChatWindow.tsx
+++ /dev/null
@@ -1,231 +0,0 @@
-'use client';
-import { ToastContainer, toast } from 'react-toastify';
-import 'react-toastify/dist/ReactToastify.css';
-import { useRef, useState, ReactElement, useCallback } from 'react';
-import type { FormEvent } from 'react';
-import { ChatMessageBubble } from '@/components/chat/ChatMessageBubble';
-import { UploadDocumentsForm } from '@/components/UploadDocumentsForm';
-import { IntermediateStep } from './IntermediateStep';
-import { useChat } from '@/app/hooks/useChat';
-import { Avatar } from '@nextui-org/react';
-import BotInfoCard from '../BotInfoCard';
-import AppendixIcon from '@/public/icons/AppendixIcon';
-import { ToolsCheck } from './ToolsCheck';
-import { ImgItem } from './ImgItem';
-
-export function ChatWindow(props: {
-  endpoint: string;
-  botId?: string;
-  emptyStateComponent?: ReactElement;
-  placeholder?: string;
-  titleText?: string;
-  avatar?: string;
-  name?: string;
-  showIngestForm?: boolean;
-  showIntermediateStepsToggle?: boolean;
-  prompt?: string;
-  description?: string;
-  starters?: string[];
-  streamming?: boolean;
-  loading?: boolean;
-  enableImgGeneration?: boolean;
-  voice?: string;
-}) {
-  const messageContainerRef = useRef<HTMLDivElement | null>(null);
-
-  const {
-    endpoint,
-    emptyStateComponent,
-    placeholder,
-    titleText,
-    showIngestForm,
-    showIntermediateStepsToggle,
-    avatar,
-    description,
-    starters,
-    name,
-    loading = false,
-    prompt,
-    botId,
-    enableImgGeneration,
-    voice,
-  } = props;
-
-  const [showIntermediateSteps, setShowIntermediateSteps] = useState(true);
-  const ingestForm = showIngestForm && (
-    <UploadDocumentsForm></UploadDocumentsForm>
-  );
-  const intemediateStepsToggle = showIntermediateStepsToggle && (
-    <div>
-      <input
-        type="checkbox"
-        id="show_intermediate_steps"
-        name="show_intermediate_steps"
-        checked={showIntermediateSteps}
-        onChange={(e) => setShowIntermediateSteps(e.target.checked)}
-      ></input>
-      <label htmlFor="show_intermediate_steps"> Show intermediate steps</label>
-    </div>
-  );
-
-  const [sourcesForMessages, setSourcesForMessages] = useState<
-    Record<string, any>
-  >({});
-
-  const {
-    messages,
-    input,
-    setInput,
-    handleInputChange,
-    handleSubmit,
-    isLoading: chatEndpointIsLoading,
-    stop,
-  } = useChat({
-    api: endpoint,
-    onError: (e) => {
-      toast(e.message, {
-        theme: 'light',
-      });
-    },
-  });
-
-  const handleKeydown = useCallback(
-    (ev: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      if (ev.key === 'Enter') {
-        ev.preventDefault();
-        handleSubmit({
-          botId,
-          prompt,
-          enableImgGeneration,
-          show_intermediate_steps: true,
-        });
-      }
-    },
-    [handleSubmit, prompt, enableImgGeneration],
-  );
-
-  const welcomeComponent = emptyStateComponent ?? (
-    <BotInfoCard
-      loading={loading}
-      name={name!}
-      description={description!}
-      avatar={avatar!}
-      starters={starters!}
-      setInput={setInput}
-    />
-  );
-
-  const sendMessage = useCallback(
-    (e: FormEvent<HTMLFormElement>) => {
-      e.preventDefault();
-      setInput('');
-      if (!chatEndpointIsLoading) {
-        return handleSubmit({
-          prompt,
-          enableImgGeneration,
-          show_intermediate_steps: true,
-        });
-      }
-      stop();
-    },
-    [chatEndpointIsLoading, handleSubmit, prompt, stop, enableImgGeneration],
-  );
-
-  return (
-    <div className="flex flex-col h-full items-center p-2 md:p-4 grow overflow-hidden relative mx-auto w-[1024px]">
-      <h2 className="items-center text-l">{titleText}</h2>
-      <h3
-        className={`${
-          messages.length > 0 ? '' : 'hidden'
-        } text-xl flex items-center`}
-      >
-        <Avatar
-          src={avatar!}
-          className="h-12 w-12 text-large m-4"
-          name={name!}
-        />
-
-        <div className="flex">{name}</div>
-      </h3>
-      {messages.length === 0 ? welcomeComponent : ''}
-
-      <div
-        className="flex flex-col-reverse w-full mb-16 overflow-auto transition-[flex-grow] ease-in-out"
-        ref={messageContainerRef}
-      >
-        {messages.length > 0
-          ? [...messages].reverse().map((m, i) => {
-              const sourceKey = (messages.length - 1 - i).toString();
-              if (m.role === 'system') {
-                return (
-                  <IntermediateStep key={m.id} message={m}></IntermediateStep>
-                );
-              }
-              if (/\$\$TOOLS\$\$/.test(m.content) && enableImgGeneration) {
-                if (/\$\$END\$\$/.test(m.content)) {
-                  return (
-                    <ImgItem
-                      key={m.id}
-                      aiName={name}
-                      aiAvatar={avatar}
-                      message={m}
-                    />
-                  );
-                }
-                return (
-                  <ToolsCheck key={m.id} aiName={name} aiAvatar={avatar} />
-                );
-              }
-              return (
-                <ChatMessageBubble
-                  key={m.id}
-                  message={m}
-                  aiName={name}
-                  aiAvatar={avatar}
-                  voice={voice}
-                  sources={sourcesForMessages[sourceKey]}
-                ></ChatMessageBubble>
-              );
-            })
-          : ''}
-      </div>
-
-      {messages.length === 0 && ingestForm}
-      <form
-        className="flex w-full flex-col absolute p-2 md:p-4inset-x-0 bottom-0"
-        onSubmit={sendMessage}
-      >
-        <div className="flex">{intemediateStepsToggle}</div>
-        <label htmlFor="chat-input" className="sr-only">
-          Enter your prompt
-        </label>
-        <div className="relative">
-          <button
-            type="button"
-            className="absolute inset-y-0 left-0 flex items-center pl-3 text-slate-500 hover:text-blue-500 dark:text-slate-400 dark:hover:text-blue-500"
-          >
-            <AppendixIcon />
-
-            <span className="sr-only">Use voice input</span>
-          </button>
-          <textarea
-            id="chat-input"
-            className="block w-full resize-none rounded-xl bg-white whitespace-nowrap border p-4 pl-10 pr-20 text-sm text-slate-900 focus:outline-none focus:ring-2 focus:ring-blue-500 dark:bg-slate-800 dark:text-slate-200 dark:placeholder-slate-400 dark:focus:ring-blue-500 sm:text-base"
-            rows={1}
-            placeholder={placeholder}
-            value={input}
-            onChange={handleInputChange}
-            onKeyDown={handleKeydown}
-          />
-          <button
-            type="submit"
-            className="absolute bottom-2 right-2.5 rounded-lg bg-blue-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-blue-800 focus:outline-none focus:ring-4 focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 sm:text-base"
-          >
-            {chatEndpointIsLoading ? 'Cancel' : 'Send'}
-          </button>
-        </div>
-      </form>
-      <ToastContainer />
-    </div>
-  );
-}