diff --git a/matrix_sdk/Cargo.toml b/matrix_sdk/Cargo.toml
index a9aed8fa..1da64e19 100644
--- a/matrix_sdk/Cargo.toml
+++ b/matrix_sdk/Cargo.toml
@@ -24,14 +24,17 @@ serde_json = "1.0.52"
 url = "2.1.1"
 uuid = { version = "0.8.1", features = ["v4"] }
 
-matrix-sdk-base = { version = "0.1.0", path = "../matrix_sdk_base" }
 matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" }
-matrix-sdk-crypto = { version = "0.1.0", path = "../matrix_sdk_crypto", optional = true }
 
 # Misc dependencies
 thiserror = "1.0.16"
 tracing = "0.1.13"
 
+[dependencies.matrix-sdk-base]
+version = "0.1.0"
+path = "../matrix_sdk_base"
+default_features = false
+
 [dependencies.tracing-futures]
 version = "0.2.4"
 default-features = false
diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml
index 9056089d..240210c0 100644
--- a/matrix_sdk_base/Cargo.toml
+++ b/matrix_sdk_base/Cargo.toml
@@ -32,24 +32,14 @@ matrix-sdk-crypto = { path = "../matrix_sdk_crypto", optional = true }
 
 # Misc dependencies
 thiserror = "1.0.16"
-tracing = "0.1.13"
-
-[dependencies.tracing-futures]
-version = "0.2.4"
-default-features = false
-features = ["std", "std-future"]
 
 [dependencies.tokio]
 version = "0.2.20"
 default-features = false
-features = ["sync", "time", "fs"]
+features = ["sync", "fs"]
 
 [dev-dependencies]
 matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" }
 tokio = { version = "0.2.20", features = ["rt-threaded", "macros"] }
-ruma-identifiers = { version = "0.16.1", features = ["rand"] }
-serde_json = "1.0.52"
 tracing-subscriber = "0.2.5"
 tempfile = "3.1.0"
-mockito = "0.25.1"
-lazy_static = "1.4.0"
diff --git a/matrix_sdk_base/src/base_client.rs b/matrix_sdk_base/src/base_client.rs
index 688b0d90..f0c4a2a5 100644
--- a/matrix_sdk_base/src/base_client.rs
+++ b/matrix_sdk_base/src/base_client.rs
@@ -268,8 +268,8 @@ impl Client {
     }
 
     pub(crate) async fn get_or_create_joined_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> {
-        #[allow(clippy::or_fun_call)]
         let mut rooms = self.joined_rooms.write().await;
+        #[allow(clippy::or_fun_call)]
         rooms
             .entry(room_id.clone())
             .or_insert(Arc::new(RwLock::new(Room::new(