diff --git a/Cargo.lock b/Cargo.lock
index 98ab6d7..f19e85a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -526,19 +526,12 @@ name = "cli"
 version = "0.1.0"
 dependencies = [
  "bot",
- "chrono",
- "clickhouse",
- "clickhouse_pool",
  "config",
  "database",
- "poise",
- "serde",
  "tokio",
  "tokio-cron-scheduler",
- "toml",
  "tool_tracing",
  "tracing",
- "uuid",
 ]
 
 [[package]]
diff --git a/apps/cli/Cargo.toml b/apps/cli/Cargo.toml
index 4986deb..d5f6453 100644
--- a/apps/cli/Cargo.toml
+++ b/apps/cli/Cargo.toml
@@ -5,17 +5,10 @@ edition = "2021"
 
 
 [dependencies]
-poise = { workspace = true }
 tokio = { workspace = true }
-serde = { workspace = true }
 tracing = { workspace = true }
 database = { path = "../../libs/database" }
 tool_tracing = { path = "../../libs/tool_tracing" }
-toml = "0.8"
-clickhouse_pool = { path = "../../libs/clickhouse_pool" }
-clickhouse = { workspace = true }
-uuid = { workspace = true }
-chrono = { workspace = true }
 tokio-cron-scheduler = { version = "0.14", features = [
   "tracing-subscriber",
   "signal",
diff --git a/apps/cli/src/main.rs b/apps/cli/src/main.rs
index 93c9313..a177e72 100644
--- a/apps/cli/src/main.rs
+++ b/apps/cli/src/main.rs
@@ -1,16 +1,18 @@
 use bot::start_bot;
 use config::parse_local_config;
+use database::{create_manager_and_init, create_pool_manager};
+use tool_tracing::init::init_tracing;
 use tracing::{error, info};
 
 #[tokio::main]
 async fn main() {
     println!(include_str!("banner.art"));
     let config = parse_local_config();
-    tool_tracing::init::init_tracing(config.tracing.clone(), config.bot_name.clone());
+    init_tracing(config.tracing.clone(), config.bot_name.clone());
 
     info!("Init Database");
-    let datalake_config = database::create_pool_manager(config.persistence.clone()).unwrap();
-    let manager = match database::create_manager_and_init(datalake_config).await {
+    let datalake_config = create_pool_manager(config.persistence.clone()).unwrap();
+    let manager = match create_manager_and_init(datalake_config).await {
         Ok(manager) => {
             info!("Database manager created successfully");
             manager