diff --git a/android/app/src/main/kotlin/com/freaccess/hub/MainActivity.kt b/android/app/src/main/kotlin/com/freaccess/hub/MainActivity.kt
index 2cf5fe44..767f00ff 100644
--- a/android/app/src/main/kotlin/com/freaccess/hub/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/freaccess/hub/MainActivity.kt
@@ -1,53 +1,29 @@
 package com.freaccess.hub
 
 import android.os.Bundle
-
 import android.provider.Settings
-
 import io.flutter.embedding.android.FlutterFragmentActivity
-
 import io.flutter.embedding.engine.FlutterEngine
-
 import io.flutter.plugin.common.MethodChannel
 
 class MainActivity: FlutterFragmentActivity() {
-
   private val CHANNEL = "com.freaccess.hub/getAndroidId"
-
   override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-
     super.configureFlutterEngine(flutterEngine)
-
     MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
-
       if (call.method == "getAndroidId") {
-
         val androidId = getAndroidId()
-
         if (androidId != null) {
-
           result.success(androidId)
-
         } else {
-
           result.error("UNAVAILABLE", "Android ID not available.", null)
-
         }
-
       } else {
-
         result.notImplemented()
-
       }
-
     }
-
   }
-
   private fun getAndroidId(): String? {
-
     return Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-
   }
-
 }
\ No newline at end of file
diff --git a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
index e5710f7b..0c68525e 100644
--- a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
+++ b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
@@ -131,7 +131,6 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
   }
 
   static void _handleError(BuildContext context, String errorMsg) {
-    AuthenticationService.signOut(context);
     DialogUtil.error(context, errorMsg);
   }
 
diff --git a/lib/main.dart b/lib/main.dart
index 24ebdf9b..7fcd9d7b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -281,7 +281,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
     if (state == AppLifecycleState.detached) {
       await LocalizationService.processLocals(context);
       FirebaseMessagingService().updateDeviceToken();
-    }
+    } 
   }
 
   @override