diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs
index 33ff309f580e6f670efa39a60b521ab6f21b1a61..ef4e455db37bb20f529e823deead3256201f4c5c 100644
--- a/src/api/client_server/keys.rs
+++ b/src/api/client_server/keys.rs
@@ -14,7 +14,7 @@
         federation,
     },
     serde::Raw,
-    DeviceId, DeviceKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
+    DeviceKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
 };
 use serde_json::json;
 use std::collections::{BTreeMap, HashMap, HashSet};
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index 0479322bada4eccd88d50a16f2876e01aaa7db6a..f7907ce253e3ffd29cc00b8d4084ced88058b0d3 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -10,7 +10,7 @@
         RoomEventType, StateEventType,
     },
     serde::Raw,
-    DeviceId, OwnedDeviceId, OwnedUserId, RoomId, UserId,
+    OwnedDeviceId, OwnedUserId, RoomId, UserId,
 };
 use std::{
     collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
diff --git a/src/api/ruma_wrapper/axum.rs b/src/api/ruma_wrapper/axum.rs
index c71d36b917c366885f49780e3637847455af8899..818cffcb0539708b7eb8ddcfc5b76b94f13f9f8d 100644
--- a/src/api/ruma_wrapper/axum.rs
+++ b/src/api/ruma_wrapper/axum.rs
@@ -17,7 +17,7 @@
 use http::StatusCode;
 use ruma::{
     api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
-    CanonicalJsonValue, DeviceId, OwnedDeviceId, OwnedServerName, ServerName, UserId,
+    CanonicalJsonValue, OwnedDeviceId, OwnedServerName, UserId,
 };
 use serde::Deserialize;
 use tracing::{debug, error, warn};
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index a8ae27268d03312ff9f625f1f5ac369392bbff51..513a07691afd7be9c520f73d3c0f617b1de6f525 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -43,7 +43,7 @@
     serde::{Base64, JsonObject, Raw},
     to_device::DeviceIdOrAllDevices,
     CanonicalJsonValue, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId,
-    OwnedServerName, OwnedServerSigningKeyId, OwnedUserId, RoomId, ServerName, ServerSigningKeyId,
+    OwnedServerName, OwnedServerSigningKeyId, OwnedUserId, RoomId, ServerName,
 };
 use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
 use std::{
diff --git a/src/config/mod.rs b/src/config/mod.rs
index e0efa60f995bab289b3fa67723811873709bd8bc..2c31b6b11e58c9af70a0b378a7f900cab989bf5b 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -4,7 +4,7 @@
     net::{IpAddr, Ipv4Addr},
 };
 
-use ruma::{OwnedServerName, RoomVersionId, ServerName};
+use ruma::{OwnedServerName, RoomVersionId};
 use serde::{de::IgnoredAny, Deserialize};
 use tracing::warn;
 
diff --git a/src/database/key_value/globals.rs b/src/database/key_value/globals.rs
index 75d00b4d9dc43c97c8b37006811f2b571a1773c9..4332930f3988e17eb2577993876010903e7738d8 100644
--- a/src/database/key_value/globals.rs
+++ b/src/database/key_value/globals.rs
@@ -5,8 +5,7 @@
 use ruma::{
     api::federation::discovery::{ServerSigningKeys, VerifyKey},
     signatures::Ed25519KeyPair,
-    DeviceId, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, ServerName, ServerSigningKeyId,
-    UserId,
+    DeviceId, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, ServerName, UserId,
 };
 
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
diff --git a/src/database/key_value/users.rs b/src/database/key_value/users.rs
index 3bb8e6160864b4f000b9f5f5d8be52784267615d..f7ee07cfbd19c984e3e0ffedd82193504acf3a95 100644
--- a/src/database/key_value/users.rs
+++ b/src/database/key_value/users.rs
@@ -5,8 +5,8 @@
     encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
     events::{AnyToDeviceEvent, StateEventType},
     serde::Raw,
-    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, MxcUri, OwnedUserId,
-    UInt, UserId,
+    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, OwnedUserId, UInt,
+    UserId,
 };
 use ruma::{OwnedDeviceId, OwnedDeviceKeyId, OwnedMxcUri};
 use tracing::warn;
diff --git a/src/database/mod.rs b/src/database/mod.rs
index f4ca44f149605d46b86467937d5262a8766c9375..689ab57e05100e0ab5c0471150711f0a041bd9dc 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -17,7 +17,7 @@
         GlobalAccountDataEvent, GlobalAccountDataEventType, StateEventType,
     },
     push::Ruleset,
-    DeviceId, EventId, RoomId, UserId,
+    EventId, RoomId, UserId,
 };
 use std::{
     collections::{BTreeMap, HashMap, HashSet},
diff --git a/src/service/globals/data.rs b/src/service/globals/data.rs
index f333254f5cfa67e2b87bd15b74123c1e5b2cffd0..04371a0aa484c0d5d20a690fcdbcf759868ec6a5 100644
--- a/src/service/globals/data.rs
+++ b/src/service/globals/data.rs
@@ -4,7 +4,7 @@
 use ruma::{
     api::federation::discovery::{ServerSigningKeys, VerifyKey},
     signatures::Ed25519KeyPair,
-    DeviceId, OwnedServerSigningKeyId, ServerName, ServerSigningKeyId, UserId,
+    DeviceId, OwnedServerSigningKeyId, ServerName, UserId,
 };
 
 use crate::Result;
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index e7daff8c22b0d08dac78a896303f1f62faee109b..44192e0178730e98eed94da9c98eb86d4e93533a 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -12,7 +12,7 @@
         client::sync::sync_events,
         federation::discovery::{ServerSigningKeys, VerifyKey},
     },
-    DeviceId, EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UserId,
+    DeviceId, RoomVersionId, ServerName, UserId,
 };
 use std::{
     collections::{BTreeMap, HashMap},
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index 2d831f7b1edf83d69fd192daa53ed12b2c8706ef..ae63d9a14ef18a27b877c27039295c1008f782f4 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -31,7 +31,7 @@
     int,
     serde::Base64,
     state_res::{self, RoomVersion, StateMap},
-    uint, EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName, ServerSigningKeyId,
+    uint, EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName,
 };
 use serde_json::value::RawValue as RawJsonValue;
 use tracing::{debug, error, info, trace, warn};
diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index e96afce90d82427171c7ff645183f1cc236ba314..dc859d8f996cabd9141944bb11d9c6463048139f 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -24,7 +24,7 @@
         GlobalAccountDataEventType, RoomEventType, StateEventType,
     },
     push::{Action, Tweak},
-    state_res, uint, EventId, RoomAliasId, RoomId, ServerName, UserId,
+    state_res, uint, EventId, RoomAliasId, RoomId, UserId,
 };
 use serde::Deserialize;
 use serde_json::value::to_raw_value;
diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs
index ac66f03dfec3421581897284212adac7b5465523..9dcfa8be2079023eb902d695c89995b14afb9b0e 100644
--- a/src/service/users/mod.rs
+++ b/src/service/users/mod.rs
@@ -7,8 +7,8 @@
     encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
     events::AnyToDeviceEvent,
     serde::Raw,
-    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MxcUri, OwnedDeviceId, OwnedDeviceKeyId,
-    OwnedMxcUri, OwnedUserId, RoomAliasId, UInt, UserId,
+    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, OwnedDeviceId, OwnedDeviceKeyId, OwnedMxcUri,
+    OwnedUserId, RoomAliasId, UInt, UserId,
 };
 
 use crate::{services, Error, Result};
diff --git a/src/utils/error.rs b/src/utils/error.rs
index bd3d73c07c5f18c364bb749a4f418312faf28f44..8967acb7a74ed2546f9810317322d0f78442f33a 100644
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@@ -6,7 +6,7 @@
         error::{Error as RumaError, ErrorKind},
         uiaa::{UiaaInfo, UiaaResponse},
     },
-    OwnedServerName, ServerName,
+    OwnedServerName,
 };
 use thiserror::Error;
 use tracing::{error, warn};