diff --git a/crates/orchestrator/src/generators/chain_spec.rs b/crates/orchestrator/src/generators/chain_spec.rs
index 9497ebf74b7c5af9294b1783081e4b67dd7514d9..fd81f4d80a7b7a80dd1b0546dcee5d88428ba80e 100644
--- a/crates/orchestrator/src/generators/chain_spec.rs
+++ b/crates/orchestrator/src/generators/chain_spec.rs
@@ -135,8 +135,10 @@ impl ChainSpec {
             let cmd = self.command.as_ref().unwrap();
             let mut args: Vec<String> = vec!["build-spec".into()];
             if let Some(chain_name) = self.chain_name.as_ref() {
-                args.push("--chain".into());
-                args.push(chain_name.clone());
+                if !chain_name.is_empty() {
+                    args.push("--chain".into());
+                    args.push(chain_name.clone());
+                }
             }
             args.push("--disable-default-bootnode".into());
 
@@ -394,17 +396,19 @@ impl ChainSpec {
                 }
             }
 
-            println!(
-                "{:#?}",
-                chain_spec_json.pointer(format!("{}/session/keys", pointer).as_str())
-            );
+            // TODO: move to logger
+            // println!(
+            //     "{:#?}",
+            //     chain_spec_json.pointer(format!("{}/session/keys", pointer).as_str())
+            // );
             // Clear authorities
             clear_authorities(&pointer, &mut chain_spec_json);
 
-            println!(
-                "{:#?}",
-                chain_spec_json.pointer(format!("{}/session/keys", pointer).as_str())
-            );
+            // TODO: move to logger
+            // println!(
+            //     "{:#?}",
+            //     chain_spec_json.pointer(format!("{}/session/keys", pointer).as_str())
+            // );
 
             // TODO: add to logger
             // println!("BALANCES");
@@ -412,10 +416,11 @@ impl ChainSpec {
             // add balances
             add_balances(&pointer, &mut chain_spec_json, &relaychain.nodes, 0);
 
-            println!(
-                "{:#?}",
-                chain_spec_json.pointer(format!("{}/balances", pointer).as_str())
-            );
+            // TODO: move to logger
+            // println!(
+            //     "{:#?}",
+            //     chain_spec_json.pointer(format!("{}/balances", pointer).as_str())
+            // );
 
             // Get validators to add as authorities
             let validators: Vec<&NodeSpec> = relaychain
@@ -541,9 +546,6 @@ where
     T: FileSystem,
     U: AsRef<Path>,
 {
-    println!("es:");
-    println!("{:?}", para_genesis_config.state_path.as_ref());
-    println!("{:?}", para_genesis_config.wasm_path.as_ref());
     if let Some(val) = chain_spec_json.pointer_mut(runtime_config_ptr) {
         let paras_pointer = if val.get("paras").is_some() {
             "/paras/paras"
@@ -556,8 +558,6 @@ where
             "/paras/paras"
         };
 
-        println!("{:#?}", paras_pointer);
-
         let paras = val.pointer_mut(paras_pointer).ok_or(anyhow!(
             "paras pointer should be valid {:?} ",
             paras_pointer
@@ -741,7 +741,6 @@ fn add_authorities(
 ) {
     if let Some(val) = chain_spec_json.pointer_mut(runtime_config_ptr) {
         let keys: Vec<GenesisNodeKey> = nodes.iter().map(|node| get_node_keys(node)).collect();
-        println!("{:#?}", keys);
         val["session"]["keys"] = json!(keys);
     } else {
         unreachable!("pointer to runtime config should be valid!")
@@ -777,7 +776,6 @@ fn add_aura_authorities(
                     .clone()
             })
             .collect();
-        println!("{:#?}", keys);
         val["aura"]["authorities"] = json!(keys);
     } else {
         unreachable!("pointer to runtime config should be valid!")
@@ -823,7 +821,6 @@ fn add_collator_selection(
                     .clone()
             })
             .collect();
-        println!("{:#?}", keys);
         // collatorSelection.invulnerables
         if let Some(invulnerables) = val.pointer_mut("collatorSelection/invulnerables") {
             *invulnerables = json!(keys);
diff --git a/crates/orchestrator/src/lib.rs b/crates/orchestrator/src/lib.rs
index 93189d349be2d0b714ca56b539e221d018ab89da..27a8f4d7130b84573d754d1e730eca12203bb29e 100644
--- a/crates/orchestrator/src/lib.rs
+++ b/crates/orchestrator/src/lib.rs
@@ -64,7 +64,8 @@ where
         mut network_spec: NetworkSpec,
     ) -> Result<Network<T>, OrchestratorError> {
         // main driver for spawn the network
-        println!("{:#?}", network_spec);
+        // TODO: move to logger
+        // println!("{:#?}", network_spec);
 
         // create namespace
         let ns = self.provider.create_namespace().await?;
@@ -182,7 +183,6 @@ where
 
         // Build raw version
         network_spec.relaychain.chain_spec.build_raw(&ns).await?;
-        println!("{:#?}", network_spec.relaychain.chain_spec);
 
         // get the bootnodes to spawn first and calculate the bootnode string for use later
         let mut bootnodes = vec![];
diff --git a/crates/orchestrator/src/network_spec.rs b/crates/orchestrator/src/network_spec.rs
index e8265088036489c08c4fb7c951ea5a6ab3fcc530..13f49b870bba2ff73311abebc612b3bc17b08c08 100644
--- a/crates/orchestrator/src/network_spec.rs
+++ b/crates/orchestrator/src/network_spec.rs
@@ -92,7 +92,5 @@ mod tests {
         assert_eq!(network_spec.parachains.len(), 1);
         let para_100 = network_spec.parachains.get(0).unwrap();
         assert_eq!(para_100.id, 100);
-
-        println!("{:#?}", network_spec);
     }
 }
diff --git a/crates/provider/src/native.rs b/crates/provider/src/native.rs
index 8609852e9636b8ebdf0fde16be14fe71516272d4..2bc95e90c1c99d5580a817e38c09104d936c947e 100644
--- a/crates/provider/src/native.rs
+++ b/crates/provider/src/native.rs
@@ -269,9 +269,9 @@ impl<FS: FileSystem + Send + Sync + Clone + 'static> ProviderNamespace for Nativ
         } in options.commands
         {
             // TODO: move to logger
-            println!("{:#?}, {:#?}", command, args);
-            println!("{:#?}", self.base_dir.to_string_lossy());
-            println!("{:#?}", local_output_path.as_os_str());
+            // println!("{:#?}, {:#?}", command, args);
+            // println!("{:#?}", self.base_dir.to_string_lossy());
+            // println!("{:#?}", local_output_path.as_os_str());
             let local_output_full_path = format!(
                 "{}{}{}",
                 self.base_dir.to_string_lossy(),