diff --git a/lib/src/kdbx_file.dart b/lib/src/kdbx_file.dart
index 3e61587..16b3885 100644
--- a/lib/src/kdbx_file.dart
+++ b/lib/src/kdbx_file.dart
@@ -3,15 +3,7 @@ import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import 'package:kdbx/kdbx.dart';
-import 'package:kdbx/src/credentials/credentials.dart';
-import 'package:kdbx/src/crypto/protected_value.dart';
-import 'package:kdbx/src/kdbx_consts.dart';
-import 'package:kdbx/src/kdbx_dao.dart';
-import 'package:kdbx/src/kdbx_exceptions.dart';
 import 'package:kdbx/src/kdbx_format.dart';
-import 'package:kdbx/src/kdbx_group.dart';
-import 'package:kdbx/src/kdbx_header.dart';
-import 'package:kdbx/src/kdbx_object.dart';
 import 'package:logging/logging.dart';
 import 'package:quiver/check.dart';
 import 'package:synchronized/synchronized.dart';
diff --git a/test/kdbx_customdata_test.dart b/test/kdbx_customdata_test.dart
index 7967588..8ee2ba9 100644
--- a/test/kdbx_customdata_test.dart
+++ b/test/kdbx_customdata_test.dart
@@ -1,8 +1,5 @@
 // ignore_for_file: invalid_use_of_protected_member
 
-@Tags(['kdbx4'])
-
-import 'dart:io';
 
 import 'package:clock/clock.dart';
 import 'package:kdbx/kdbx.dart';
diff --git a/test/kdbx_upgrade_test.dart b/test/kdbx_upgrade_test.dart
index 5141df7..e90b790 100644
--- a/test/kdbx_upgrade_test.dart
+++ b/test/kdbx_upgrade_test.dart
@@ -1,6 +1,3 @@
-@Tags(['kdbx3', 'kdbx4'])
-
-import 'dart:convert';
 
 import 'package:kdbx/kdbx.dart';
 import 'package:kdbx/src/internal/extension_utils.dart';
diff --git a/test/merge/kdbx_merge_test.dart b/test/merge/kdbx_merge_test.dart
index 243b5c6..f780c95 100644
--- a/test/merge/kdbx_merge_test.dart
+++ b/test/merge/kdbx_merge_test.dart
@@ -72,8 +72,6 @@ void main() {
     );
   });
 
-//TODO: https://github.com/authpass/authpass/issues/335
-
   group('Real merges', () {
     final icon1 = KdbxCustomIcon(
       uuid: KdbxUuid.random(),