diff --git a/lib/encryption/key_manager.dart b/lib/encryption/key_manager.dart
index 8e182ab0..15977bb9 100644
--- a/lib/encryption/key_manager.dart
+++ b/lib/encryption/key_manager.dart
@@ -596,9 +596,6 @@ class KeyManager {
           final sessionId = sessionEntry.key;
           final session = sessionEntry.value;
           final sessionData = session.sessionData;
-          if (!(sessionData is Map)) {
-            continue;
-          }
           Map<String, dynamic>? decrypted;
           try {
             decrypted = json.decode(decryption.decrypt(sessionData['ephemeral'],
diff --git a/lib/src/client.dart b/lib/src/client.dart
index 1f4a2c62..9503adc1 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -30,18 +30,7 @@ import 'package:collection/collection.dart' show IterableExtension;
 
 import '../encryption.dart';
 import '../matrix.dart';
-import 'database/database_api.dart';
-import 'event.dart';
-import 'room.dart';
-import 'user.dart';
-import 'utils/commands_extension.dart';
-import 'utils/device_keys_list.dart';
-import 'utils/event_update.dart';
-import 'utils/http_timeout.dart';
-import 'utils/matrix_file.dart';
 import 'utils/run_benchmarked.dart';
-import 'utils/to_device_event.dart';
-import 'utils/uia_request.dart';
 import 'utils/multilock.dart';
 
 typedef RoomSorter = int Function(Room a, Room b);
diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index 8cdb0acf..d2656aea 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -27,7 +27,6 @@ import 'package:matrix/encryption/utils/outbound_group_session.dart';
 import 'package:matrix/encryption/utils/ssss_cache.dart';
 import 'package:matrix/encryption/utils/stored_inbound_group_session.dart';
 import 'package:matrix/matrix.dart';
-import 'package:matrix/src/event_status.dart';
 import 'package:matrix/src/utils/queued_to_device_event.dart';
 import 'package:matrix/src/utils/run_benchmarked.dart';
 
diff --git a/lib/src/event.dart b/lib/src/event.dart
index deb703d1..b8979b46 100644
--- a/lib/src/event.dart
+++ b/lib/src/event.dart
@@ -22,13 +22,8 @@ import 'dart:typed_data';
 import 'package:http/http.dart' as http;
 
 import '../matrix.dart';
-import 'event_status.dart';
-import 'room.dart';
-import 'utils/crypto/encrypted_file.dart';
 import 'utils/event_localizations.dart';
 import 'utils/html_to_text.dart';
-import 'utils/matrix_localizations.dart';
-import 'utils/receipt.dart';
 
 abstract class RelationshipTypes {
   static const String reply = 'm.in_reply_to';
diff --git a/lib/src/room.dart b/lib/src/room.dart
index 1da71a2f..b7ad5218 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -24,18 +24,8 @@ import 'package:html_unescape/html_unescape.dart';
 import 'package:matrix/src/utils/space_child.dart';
 
 import '../matrix.dart';
-import 'client.dart';
-import 'event.dart';
-import 'event_status.dart';
-import 'timeline.dart';
-import 'user.dart';
-import 'utils/crypto/encrypted_file.dart';
-import 'utils/event_update.dart';
 import 'utils/markdown.dart';
 import 'utils/marked_unread.dart';
-import 'utils/matrix_file.dart';
-import 'utils/matrix_localizations.dart';
-import 'voip_content.dart';
 
 /// https://github.com/matrix-org/matrix-doc/pull/2746
 /// version 1
@@ -317,14 +307,11 @@ class Room {
       }
     }
 
-    if (client.directChats is Map<String, dynamic>) {
-      return client.directChats.entries
-          .firstWhereOrNull((MapEntry<String, dynamic> e) {
-        final roomIds = e.value;
-        return roomIds is List<dynamic> && roomIds.contains(id);
-      })?.key;
-    }
-    return null;
+    return client.directChats.entries
+        .firstWhereOrNull((MapEntry<String, dynamic> e) {
+      final roomIds = e.value;
+      return roomIds is List<dynamic> && roomIds.contains(id);
+    })?.key;
   }
 
   /// Wheither this is a direct chat or not
@@ -1171,7 +1158,7 @@ class Room {
       ]]) {
     final userList = <User>[];
     final members = states[EventTypes.RoomMember];
-    if (members != null && members is Map<String, dynamic>) {
+    if (members != null) {
       for (final entry in members.entries) {
         final state = entry.value;
         if (state.type == EventTypes.RoomMember) userList.add(state.asUser);
diff --git a/lib/src/timeline.dart b/lib/src/timeline.dart
index 1e1e7b5e..104462f5 100644
--- a/lib/src/timeline.dart
+++ b/lib/src/timeline.dart
@@ -21,10 +21,6 @@ import 'dart:async';
 import 'package:collection/src/iterable_extensions.dart';
 
 import '../matrix.dart';
-import 'event.dart';
-import 'event_status.dart';
-import 'room.dart';
-import 'utils/event_update.dart';
 
 /// Represents the timeline of a room. The callback [onUpdate] will be triggered
 /// automatically. The initial
diff --git a/lib/src/user.dart b/lib/src/user.dart
index 2f9c53cc..ef266880 100644
--- a/lib/src/user.dart
+++ b/lib/src/user.dart
@@ -18,9 +18,6 @@
 
 import '../matrix.dart';
 
-import 'event.dart';
-import 'room.dart';
-
 /// Represents a Matrix User which may be a participant in a Matrix Room.
 class User extends Event {
   factory User(
diff --git a/lib/src/utils/device_keys_list.dart b/lib/src/utils/device_keys_list.dart
index a6bdb115..9661e2cf 100644
--- a/lib/src/utils/device_keys_list.dart
+++ b/lib/src/utils/device_keys_list.dart
@@ -24,9 +24,6 @@ import 'package:matrix/matrix.dart';
 import 'package:olm/olm.dart' as olm;
 
 import '../../encryption.dart';
-import '../client.dart';
-import '../event.dart';
-import '../room.dart';
 
 enum UserVerifiedStatus { verified, unknown, unknownDevice }
 
@@ -242,8 +239,7 @@ abstract class SignableKey extends MatrixSignableKey {
 
     for (final signatureEntries in signatures!.entries) {
       final otherUserId = signatureEntries.key;
-      if (!(signatureEntries.value is Map) ||
-          !client.userDeviceKeys.containsKey(otherUserId)) {
+      if (!client.userDeviceKeys.containsKey(otherUserId)) {
         continue;
       }
       // we don't allow transitive trust unless it is for ourself
@@ -253,9 +249,6 @@ abstract class SignableKey extends MatrixSignableKey {
       for (final signatureEntry in signatureEntries.value.entries) {
         final fullKeyId = signatureEntry.key;
         final signature = signatureEntry.value;
-        if (!(fullKeyId is String) || !(signature is String)) {
-          continue;
-        }
         final keyId = fullKeyId.substring('ed25519:'.length);
         // we ignore self-signatures here
         if (otherUserId == userId && keyId == identifier) {
diff --git a/lib/src/utils/event_localizations.dart b/lib/src/utils/event_localizations.dart
index 86163a15..7415ce28 100644
--- a/lib/src/utils/event_localizations.dart
+++ b/lib/src/utils/event_localizations.dart
@@ -20,9 +20,6 @@ import 'package:collection/collection.dart';
 
 import '../../encryption.dart';
 import '../../matrix.dart';
-import '../event.dart';
-import '../room.dart';
-import 'matrix_localizations.dart';
 
 abstract class EventLocalizations {
   // As we need to create the localized body off of a different set of parameters, we
diff --git a/lib/src/utils/matrix_file.dart b/lib/src/utils/matrix_file.dart
index 32d86f7a..04154156 100644
--- a/lib/src/utils/matrix_file.dart
+++ b/lib/src/utils/matrix_file.dart
@@ -20,7 +20,6 @@
 
 import 'dart:typed_data';
 
-import 'crypto/encrypted_file.dart';
 import 'package:mime/mime.dart';
 
 import '../../matrix.dart';
diff --git a/test/client_test.dart b/test/client_test.dart
index 521f20f6..f480b1e4 100644
--- a/test/client_test.dart
+++ b/test/client_test.dart
@@ -22,9 +22,6 @@ import 'dart:typed_data';
 
 import 'package:matrix/matrix.dart';
 
-import 'package:matrix/src/client.dart';
-import 'package:matrix/src/utils/event_update.dart';
-import 'package:matrix/src/utils/matrix_file.dart';
 import 'package:olm/olm.dart' as olm;
 import 'package:test/test.dart';
 import 'package:canonical_json/canonical_json.dart';
diff --git a/test/event_test.dart b/test/event_test.dart
index e82d509f..2a7aa804 100644
--- a/test/event_test.dart
+++ b/test/event_test.dart
@@ -21,8 +21,6 @@ import 'dart:typed_data';
 
 import 'package:matrix/encryption.dart';
 import 'package:matrix/matrix.dart';
-import 'package:matrix/src/event.dart';
-import 'package:matrix/src/event_status.dart';
 import 'package:olm/olm.dart' as olm;
 import 'package:test/test.dart';
 
@@ -404,8 +402,6 @@ void main() {
           'membership': 'join'
         }
       }, room);
-      expect(
-          event.getLocalizedBody(MatrixDefaultLocalizations()) is String, true);
       expect(event.isEventTypeKnown, true);
 
       event = Event.fromJson({
diff --git a/test/fake_database.dart b/test/fake_database.dart
index 64ee745b..d97fa669 100644
--- a/test/fake_database.dart
+++ b/test/fake_database.dart
@@ -20,10 +20,8 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:matrix/matrix.dart';
-import 'package:matrix/src/database/hive_database.dart';
 import 'package:file/memory.dart';
 import 'package:hive/hive.dart';
-import 'package:matrix/src/database/fluffybox_database.dart';
 
 Future<DatabaseApi> getDatabase(Client? _) => getHiveDatabase(_);
 
diff --git a/test/matrix_database_test.dart b/test/matrix_database_test.dart
index 03d9cc17..0c88c612 100644
--- a/test/matrix_database_test.dart
+++ b/test/matrix_database_test.dart
@@ -18,7 +18,6 @@
  */
 
 import 'package:matrix/matrix.dart';
-import 'package:matrix/src/event_status.dart';
 
 import 'package:test/test.dart';
 import 'fake_database.dart';
diff --git a/test/mxc_uri_extension_test.dart b/test/mxc_uri_extension_test.dart
index c9a3ce7d..21ea321e 100644
--- a/test/mxc_uri_extension_test.dart
+++ b/test/mxc_uri_extension_test.dart
@@ -19,8 +19,6 @@
 import 'package:matrix/matrix.dart';
 
 import 'package:test/test.dart';
-import 'package:matrix/src/client.dart';
-import 'package:matrix/src/utils/uri_extension.dart';
 
 import 'fake_matrix_api.dart';
 
diff --git a/test/room_test.dart b/test/room_test.dart
index f381bf05..5999c205 100644
--- a/test/room_test.dart
+++ b/test/room_test.dart
@@ -20,11 +20,6 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:matrix/matrix.dart';
-import 'package:matrix/src/client.dart';
-import 'package:matrix/src/event.dart';
-import 'package:matrix/src/room.dart';
-import 'package:matrix/src/user.dart';
-import 'package:matrix/src/utils/matrix_file.dart';
 
 import 'package:test/test.dart';
 
diff --git a/test/timeline_test.dart b/test/timeline_test.dart
index 084f6f65..d93e420a 100644
--- a/test/timeline_test.dart
+++ b/test/timeline_test.dart
@@ -17,13 +17,8 @@
  */
 
 import 'package:matrix/matrix.dart';
-import 'package:matrix/src/event_status.dart';
 
 import 'package:test/test.dart';
-import 'package:matrix/src/client.dart';
-import 'package:matrix/src/room.dart';
-import 'package:matrix/src/timeline.dart';
-import 'package:matrix/src/utils/event_update.dart';
 import 'package:olm/olm.dart' as olm;
 import 'fake_client.dart';
 
diff --git a/test/user_test.dart b/test/user_test.dart
index 0518811c..e33b8e2d 100644
--- a/test/user_test.dart
+++ b/test/user_test.dart
@@ -17,8 +17,6 @@
  */
 
 import 'package:matrix/matrix.dart';
-import 'package:matrix/src/event.dart';
-import 'package:matrix/src/user.dart';
 
 import 'package:test/test.dart';