diff --git a/eveai_chat_workers/tasks.py b/eveai_chat_workers/tasks.py
index 9c21e8b..719a1cd 100644
--- a/eveai_chat_workers/tasks.py
+++ b/eveai_chat_workers/tasks.py
@@ -1,29 +1,22 @@
 from datetime import datetime as dt, timezone as tz
-from flask import current_app, session
+from flask import current_app
 from langchain_core.output_parsers import StrOutputParser
 from langchain_core.runnables import RunnableParallel, RunnablePassthrough
-from langchain.globals import set_debug
 from sqlalchemy.exc import SQLAlchemyError
-from celery import states
-from celery.exceptions import Ignore
-import os
 
 # OpenAI imports
-from langchain_openai import OpenAIEmbeddings, ChatOpenAI
 from langchain_core.prompts import ChatPromptTemplate
-from langchain.chains.summarize import load_summarize_chain
-from langchain.text_splitter import CharacterTextSplitter
 from langchain_core.exceptions import LangChainException
 
 from common.utils.database import Database
-from common.models.document import DocumentVersion, EmbeddingMistral, EmbeddingSmallOpenAI, Embedding
+from common.models.document import Embedding
 from common.models.user import Tenant
 from common.models.interaction import ChatSession, Interaction, InteractionEmbedding
 from common.extensions import db
 from common.utils.celery_utils import current_celery
 from common.utils.model_utils import select_model_variables, create_language_template, replace_variable_in_template
-from common.langchain.eveai_default_rag_retriever import EveAIDefaultRagRetriever
-from common.langchain.eveai_history_retriever import EveAIHistoryRetriever
+from common.langchain.retrievers.eveai_default_rag_retriever import EveAIDefaultRagRetriever
+from common.langchain.retrievers.eveai_history_retriever import EveAIHistoryRetriever
 from common.utils.business_event import BusinessEvent
 from common.utils.business_event_context import current_event