diff --git a/lib/src/components/bug_hunt_search_delegate.dart b/lib/src/components/bug_hunt_search_delegate.dart
index 996375c2b3..f5d64cb702 100644
--- a/lib/src/components/bug_hunt_search_delegate.dart
+++ b/lib/src/components/bug_hunt_search_delegate.dart
@@ -1,4 +1,3 @@
-import './components_import.dart';
 
 /// The search bar of app for searching issues based on keyword.
 class BugHuntSearchDelegate extends SearchDelegate {
diff --git a/lib/src/pages/drawer/change_password.dart b/lib/src/pages/drawer/change_password.dart
index 00cefe1b2f..069a6c2f05 100644
--- a/lib/src/pages/drawer/change_password.dart
+++ b/lib/src/pages/drawer/change_password.dart
@@ -1,4 +1,3 @@
-import '../pages_import.dart';
 
 /// The change password page for the app.
 class ChangePasswordPage extends StatefulWidget {
diff --git a/lib/src/pages/drawer/company_dashboard.dart b/lib/src/pages/drawer/company_dashboard.dart
index 8981bcb1f3..ebb8aafa9c 100644
--- a/lib/src/pages/drawer/company_dashboard.dart
+++ b/lib/src/pages/drawer/company_dashboard.dart
@@ -1,4 +1,3 @@
-import '../pages_import.dart';
 
 class CompanyDashBoardPage extends ConsumerStatefulWidget {
   const CompanyDashBoardPage({Key? key}) : super(key: key);
diff --git a/lib/src/pages/drawer/legal.dart b/lib/src/pages/drawer/legal.dart
index 6b3947b247..a1554cc724 100644
--- a/lib/src/pages/drawer/legal.dart
+++ b/lib/src/pages/drawer/legal.dart
@@ -1,4 +1,3 @@
-import '../pages_import.dart';
 
 /// Page stating the legal Terms and Conditions and Privacy
 /// Policy applying to the BLT project.
diff --git a/lib/src/providers/authstate_provider.dart b/lib/src/providers/authstate_provider.dart
index 92a8bddf3b..ba02845a31 100644
--- a/lib/src/providers/authstate_provider.dart
+++ b/lib/src/providers/authstate_provider.dart
@@ -32,23 +32,16 @@ class AuthNotifier extends StateNotifier<AsyncValue<AuthState>> {
 
   Future<void> checkFirstLogin(BuildContext context) async {
     String? firstLogin = await storage.read(key: "firstLogin");
-    if (firstLogin == null) {
-      await storage.write(key: "firstLogin", value: "false");
-    } else if (firstLogin == "false") {
-      Navigator.of(context).pushAndRemoveUntil(
-          MaterialPageRoute(builder: (context) => WelcomePage()),
-          (Route route) => false);
-    }
+    if (firstLogin == "false") {
+    Navigator.of(context).pushAndRemoveUntil(
+        MaterialPageRoute(builder: (context) => WelcomePage()),
+        (Route route) => false);
+  }
   }
 
   Future<bool> loadUserIfRemembered(BuildContext context) async {
     String? remember = await storage.read(key: "remember");
 
-    if (remember == null) {
-      checkFirstLogin(context);
-      return false;
-    }
-
     if (remember == "guest") {
       state = AsyncValue.data(AuthState.loggedIn);
       currentUser = guestUser;
@@ -62,7 +55,7 @@ class AuthNotifier extends StateNotifier<AsyncValue<AuthState>> {
     String? username = await storage.read(key: "username");
     String? accessToken = await storage.read(key: "token");
 
-    if (username == null || accessToken == null) {
+    if (accessToken == null) {
       return false;
     }
 
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index a443e6532c..bc31de5d5c 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -14,7 +14,7 @@ import pasteboard
 import path_provider_foundation
 import sentry_flutter
 import shared_preferences_foundation
-import sqflite
+import sqflite_darwin
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
diff --git a/test/integration_tests/issue_card_test.dart b/test/integration_tests/issue_card_test.dart
index 194ee034c4..e649868183 100644
--- a/test/integration_tests/issue_card_test.dart
+++ b/test/integration_tests/issue_card_test.dart
@@ -1,4 +1,3 @@
-import '../test_imports.dart';
 
 void main() {
   testWidgets("Issue Card Test", (WidgetTester tester) async {
diff --git a/test/integration_tests/show_company_test.dart b/test/integration_tests/show_company_test.dart
index a2b493a209..5e75fedfd6 100644
--- a/test/integration_tests/show_company_test.dart
+++ b/test/integration_tests/show_company_test.dart
@@ -1,4 +1,3 @@
-import '../test_imports.dart';
 
 void main() {
   testWidgets("Company List Test", (WidgetTester tester) async {
diff --git a/test/integration_tests/show_issues_test.dart b/test/integration_tests/show_issues_test.dart
index 034575c424..1c846a0577 100644
--- a/test/integration_tests/show_issues_test.dart
+++ b/test/integration_tests/show_issues_test.dart
@@ -1,4 +1,3 @@
-import '../test_imports.dart';
 
 void main() {
   testWidgets("Issue List Test", (WidgetTester tester) async {