diff --git a/swarms/agents/utils/AgentBuilder.py b/swarms/agents/utils/AgentBuilder.py
index cce4c3b4..fb8ef625 100644
--- a/swarms/agents/utils/AgentBuilder.py
+++ b/swarms/agents/utils/AgentBuilder.py
@@ -9,7 +9,7 @@ from langchain.chat_models.base import BaseChatModel
 from langchain.schema import BaseOutputParser
 from langchain.callbacks.base import BaseCallbackManager
 
-from .ConversationalChatAgent import ChatAgent
+from .ConversationalChatAgent import ConversationalChatAgent
 # from .ChatOpenAI import ChatOpenAI
 from langchain.chat_models import ChatOpenAI
 from .EvalOutputParser import EvalOutputParser
@@ -79,7 +79,7 @@ class AgentBuilder:
         if self.global_tools is None:
             raise ValueError("Global tools must be initialized before agent")
 
-        return ChatAgent.from_llm_and_tools(
+        return ConversationalChatAgent.from_llm_and_tools(
             llm=self.llm,
             tools=[
                 *self.global_tools,
diff --git a/swarms/agents/utils/ConversationalChatAgent.py b/swarms/agents/utils/ConversationalChatAgent.py
index 9dbd886e..c62b74ec 100644
--- a/swarms/agents/utils/ConversationalChatAgent.py
+++ b/swarms/agents/utils/ConversationalChatAgent.py
@@ -150,12 +150,12 @@ class ConversationalChatAgent(Agent):
             logging.error(f"Error while creating agent from LLM and tools: {str(e)}")
             raise e
         
-class OutputParser(AgentOutputParser):
-    def parse(self, full_output: str) -> AgentAction:
-        return AgentAction(action="chat", details={'message': full_output})
+# class OutputParser(AgentOutputParser):
+#     def parse(self, full_output: str) -> AgentAction:
+#         return AgentAction(action="chat", details={'message': full_output})
 
 
-class ChatAgent(ConversationalChatAgent):
-    def _get_default_output_parser(self):
-        """Get default output parser for this class."""
-        return OutputParser()
+# class ChatAgent(ConversationalChatAgent):
+#     def _get_default_output_parser(self):
+#         """Get default output parser for this class."""
+#         return OutputParser()