diff --git a/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/BarcodeScanningScreen.kt b/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/BarcodeScanningScreen.kt
index e878d404..e72f8549 100644
--- a/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/BarcodeScanningScreen.kt
+++ b/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/BarcodeScanningScreen.kt
@@ -198,8 +198,6 @@ class BarcodeScanningScreen : Fragment() {
                 return
             }
 
-            // TODO: - No available camera found case
-
         } catch (e: CameraAccessException) {
         } catch (e: SecurityException) {
         }
diff --git a/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/LibraryListFragment.kt b/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/LibraryListFragment.kt
index 94c52e6c..b4a05038 100644
--- a/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/LibraryListFragment.kt
+++ b/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/Fragments/LibraryListFragment.kt
@@ -165,7 +165,6 @@ class LibraryListFragment : Fragment(), LibraryListInteractionListener,
         val fabISBNScanner =
             requireView().findViewById<FloatingActionButton>(R.id.fab_action_barcode_scanner)
         fabISBNScanner.setOnClickListener {
-            Toast.makeText(requireContext(), "Not yet implemented", Toast.LENGTH_SHORT).show()
             findNavController().navigate(R.id.action_libraryListFragment_to_barcodeScanningScreen)
         }
     }
diff --git a/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/ViewModels/BarcodeScanningScreenViewModel.kt b/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/ViewModels/BarcodeScanningScreenViewModel.kt
index 069231d3..f7e9c43e 100644
--- a/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/ViewModels/BarcodeScanningScreenViewModel.kt
+++ b/app/src/main/java/com/mickstarify/zooforzotero/LibraryActivity/ViewModels/BarcodeScanningScreenViewModel.kt
@@ -3,5 +3,4 @@ package com.mickstarify.zooforzotero.LibraryActivity.ViewModels
 import androidx.lifecycle.ViewModel
 
 class BarcodeScanningScreenViewModel : ViewModel() {
-    // TODO: Implement the ViewModel
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mickstarify/zooforzotero/ZooForZoteroApplication.kt b/app/src/main/java/com/mickstarify/zooforzotero/ZooForZoteroApplication.kt
index 68c97b7c..acbe6299 100644
--- a/app/src/main/java/com/mickstarify/zooforzotero/ZooForZoteroApplication.kt
+++ b/app/src/main/java/com/mickstarify/zooforzotero/ZooForZoteroApplication.kt
@@ -1,12 +1,12 @@
 package com.mickstarify.zooforzotero
 
 import android.app.Application
-import com.facebook.flipper.android.AndroidFlipperClient
-import com.facebook.flipper.android.utils.FlipperUtils
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
-import com.facebook.flipper.plugins.inspector.DescriptorMapping
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
-import com.facebook.soloader.SoLoader
+//import com.facebook.flipper.android.AndroidFlipperClient
+//import com.facebook.flipper.android.utils.FlipperUtils
+//import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
+//import com.facebook.flipper.plugins.inspector.DescriptorMapping
+//import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
+//import com.facebook.soloader.SoLoader
 import com.mickstarify.zooforzotero.di.component.ApplicationComponent
 import com.mickstarify.zooforzotero.di.component.DaggerApplicationComponent
 import com.mickstarify.zooforzotero.di.module.ApplicationModule
@@ -18,14 +18,14 @@ class ZooForZoteroApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        SoLoader.init(this, false)
-
-        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
-            val client = AndroidFlipperClient.getInstance(this)
-            client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
-            client.addPlugin(DatabasesFlipperPlugin(this));
-            client.start()
-        }
+//        SoLoader.init(this, false)
+//
+//        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
+//            val client = AndroidFlipperClient.getInstance(this)
+//            client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
+//            client.addPlugin(DatabasesFlipperPlugin(this));
+//            client.start()
+//        }
 
 
         component = DaggerApplicationComponent.builder().applicationModule(