diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
index b1195b26fe..164364e9fd 100644
--- a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
+++ b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
@@ -9,7 +9,6 @@
 import AVKit
 import Combine
 import Compound
-import MatrixRustSDK
 import SwiftState
 import SwiftUI
 
diff --git a/ElementX/Sources/Services/ComposerDraft/ComposerDraftService.swift b/ElementX/Sources/Services/ComposerDraft/ComposerDraftService.swift
index 5f478def1b..d3fa6c08a6 100644
--- a/ElementX/Sources/Services/ComposerDraft/ComposerDraftService.swift
+++ b/ElementX/Sources/Services/ComposerDraft/ComposerDraftService.swift
@@ -8,8 +8,6 @@
 
 import Foundation
 
-import MatrixRustSDK
-
 final class ComposerDraftService: ComposerDraftServiceProtocol {
     private let roomProxy: JoinedRoomProxyProtocol
     private let threadRootEventID: String?
diff --git a/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift b/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift
index 05d0e49fe0..48518e21a2 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift
@@ -10,7 +10,7 @@ import Compound
 import MatrixRustSDK
 import SwiftUI
 
-/// Represents and issue with a timeline item's authenticity such as coming from an
+/// Represents an issue with a timeline item's authenticity such as coming from an
 /// unsigned session or being sent unencrypted in an encrypted room. See Rust's
 /// `ShieldStateCode` for more information about the meaning of the cases.
 enum EncryptionAuthenticity: Hashable {
diff --git a/ElementX/Sources/Services/Timeline/TimelineItemContent/TimelineItemThreadSummary.swift b/ElementX/Sources/Services/Timeline/TimelineItemContent/TimelineItemThreadSummary.swift
index 42d303db6d..bc47d442dc 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItemContent/TimelineItemThreadSummary.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItemContent/TimelineItemThreadSummary.swift
@@ -6,8 +6,6 @@
 // Please see LICENSE files in the repository root for full details.
 //
 
-import MatrixRustSDK
-
 enum TimelineItemThreadSummary: Hashable {
     case notLoaded
     case loading
diff --git a/ElementX/Sources/Services/UserSession/UserSessionStore.swift b/ElementX/Sources/Services/UserSession/UserSessionStore.swift
index 0b968df299..eed8f6097f 100644
--- a/ElementX/Sources/Services/UserSession/UserSessionStore.swift
+++ b/ElementX/Sources/Services/UserSession/UserSessionStore.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import Kingfisher
 import MatrixRustSDK
 
 class UserSessionStore: UserSessionStoreProtocol {