diff --git a/agenta-backend/agenta_backend/models/db_engine.py b/agenta-backend/agenta_backend/models/db_engine.py
index 07436f6a7..f9379a969 100644
--- a/agenta-backend/agenta_backend/models/db_engine.py
+++ b/agenta-backend/agenta_backend/models/db_engine.py
@@ -114,20 +114,10 @@ async def initialize_async_postgres(self):
             raise ValueError("Postgres URI cannot be None.")
 
         async with self.engine.begin() as conn:
-            # Drop all existing tables (if needed)
-            # await conn.run_sync(Base.metadata.drop_all)
-            # Create tables
+            # Drop and create tables if needed
             for model in models:
                 await conn.run_sync(model.metadata.create_all)
-        logger.info(f"Using {self.mode} database...")
-
-    async def remove_db(self) -> None:
-        """
-        Remove the database based on the mode.
-        """
-        async with self.engine.begin() as conn:
-            for model in models:
-                await conn.run_sync(model.metadata.drop_all)
+        logger.info(f"Using PostgreSQL database...")
 
     async def initialize_mongodb(self):
         """
@@ -161,6 +151,15 @@ async def init_db(self):
         else:
             await self.initialize_async_postgres()
 
+    async def remove_db(self) -> None:
+        """
+        Remove the database based on the mode.
+        """
+
+        async with self.engine.begin() as conn:
+            for model in models:
+                await conn.run_sync(model.metadata.drop_all)
+
     @asynccontextmanager
     async def get_session(self) -> AsyncGenerator[AsyncSession, None]:
         session = self.async_session()