diff --git a/Cargo.toml b/Cargo.toml
index 6eca9e7d8..5f78a95b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,6 +72,7 @@ pausable = ["openbrush_contracts/pausable"]
 timelock_controller = ["openbrush_contracts/timelock_controller"]
 proxy = ["openbrush_contracts/proxy"]
 diamond = ["openbrush_contracts/diamond"]
+mockable = ["openbrush_lang/mockable"]
 
 [profile.release]
 panic = "abort"
diff --git a/lang/Cargo.toml b/lang/Cargo.toml
index beecfc946..5a818f7dd 100644
--- a/lang/Cargo.toml
+++ b/lang/Cargo.toml
@@ -43,4 +43,5 @@ std = [
     "ink_metadata/std",
     "scale/std",
     "scale-info/std",
-]
\ No newline at end of file
+]
+mockable = []
diff --git a/lang/codegen/src/trait_definition.rs b/lang/codegen/src/trait_definition.rs
index ca4735437..232ae984d 100644
--- a/lang/codegen/src/trait_definition.rs
+++ b/lang/codegen/src/trait_definition.rs
@@ -49,8 +49,6 @@ pub fn generate(_attrs: TokenStream, _input: TokenStream) -> TokenStream {
     }
     let attrs: proc_macro2::TokenStream = _attrs.into();
     let (mock_type, attrs) = extract_mock_config(attrs);
-    println!("mock_type: {:?}", mock_type);
-    println!("extracted_attrs: {:?}", attrs);
     let mut trait_item: ItemTrait = parse2(_input).unwrap();
     let trait_without_ink_attrs;
     let ink_code;
@@ -139,7 +137,6 @@ pub fn generate(_attrs: TokenStream, _input: TokenStream) -> TokenStream {
 
         #maybe_use_mock_env
     };
-    // println!("Final output: {}", code);
     code.into()
 }
 
diff --git a/lang/src/traits.rs b/lang/src/traits.rs
index 443d2bf62..aa7f14c4e 100644
--- a/lang/src/traits.rs
+++ b/lang/src/traits.rs
@@ -79,6 +79,7 @@ pub trait Flush: ::ink_storage::traits::SpreadLayout + InkStorage {
 impl<T: ::ink_storage::traits::SpreadLayout + InkStorage> Flush for T {}
 
 /// Types for managing mock cross-contract calls in unit tests
+#[cfg(feature = "mockable")]
 pub mod mock {
     use super::AccountId;