diff --git a/enioka_scan/src/main/res/layout/activity_main_alt.xml b/enioka_scan/src/main/res/layout/activity_main_alt.xml
deleted file mode 100644
index a2d6cc14..00000000
--- a/enioka_scan/src/main/res/layout/activity_main_alt.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.ScannerCompatActivity">
-
-    <com.enioka.scanner.camera.CameraBarcodeScanView
-        android:id="@+id/camera_scan_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:forceCameraApiVersion="Auto"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:maxDistortionRatio="0.3"
-        app:minResolutionY="720"
-        app:maxResolutionY="1080"
-        app:previewRatioMode="fillAvailableSpace"
-        app:readerMode="Auto"
-        app:storePreferredResolution="false"
-        app:targetColorActive="@color/colorRed"
-        app:targetColorPaused="@color/defaultItemColor"
-        app:targetIsFixed="false"
-        app:targetStrokeWidth="5"
-        app:useAdaptiveResolution="true" />
-
-    <TextView
-        android:id="@+id/scanner_text_last_scan"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="#59ffffff"
-        android:gravity="center_horizontal|center_vertical"
-        android:text="@string/activity_scan_barcode_value_placeholder"
-        android:textColor="@android:color/black"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-    <TextView
-        android:id="@+id/scanner_text_scanner_status"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:background="#59ffffff"
-        android:gravity="center_horizontal|top"
-        android:text="@string/activity_scan_scanner_not_initialized"
-        android:textColor="@color/colorPrimaryDark"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <ImageButton
-        android:id="@+id/scanner_flashlight"
-        android:layout_width="wrap_content"
-        android:layout_height="45dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginRight="12dp"
-        android:background="@null"
-        android:src="@drawable/icn_flash_off"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/scanner_text_last_scan" />
-
-    <ImageButton
-        android:id="@+id/scanner_bt_keyboard"
-        android:layout_width="wrap_content"
-        android:layout_height="45dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginRight="12dp"
-        android:background="@null"
-        android:src="@drawable/icn_keyboard"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/scanner_flashlight" />
-
-    <Switch
-        android:id="@+id/scanner_switch_zxing"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/activity_scan_use_zxing"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/scanner_bt_keyboard" />
-
-    <Switch
-        android:id="@+id/scanner_switch_pause"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/activity_scan_pause_camera"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/scanner_switch_zxing" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/enioka_scan/src/main/res/values-fr/strings.xml b/enioka_scan/src/main/res/values-fr/strings.xml
index 525c10df..ccefae85 100644
--- a/enioka_scan/src/main/res/values-fr/strings.xml
+++ b/enioka_scan/src/main/res/values-fr/strings.xml
@@ -19,9 +19,6 @@
     <string name="scanner_status_SERVICE_SDK_SEARCH_OVER">Tous les fournisseurs de scanners matériels ont répondu</string>
 
     <!-- Others -->
-    <string name="scanner_camera_no_camera">Aucune caméra disponible. Veuillez brancher votre lecteur laser. L\'application va s\'arrêter.</string>
-    <string name="scanner_camera_open_error">Veuillez vérifier qu\'aucune autre application n\'utilise la caméra (comme ScanWedge, DataWedge…). Vérifiez aussi que la caméra fnction dans l\'application idoine.</string>
-    <string name="scanner_camera_open_error_title">Impossible de se connecter à la caméra</string>
     <string name="activity_scan_barcode_value_placeholder">10AL9271B2I8</string>
     <string name="activity_scan_scanner_not_initialized">Initialisation du scanner non commencée</string>
     <string name="app_name">EniokaScan</string>
@@ -33,6 +30,4 @@
     <string name="fragment_scan_manual_title">Saisie manuelle</string>
     <string name="activity_scan_no_compatible_sdk">Aucun scanner compatible n\'est disponible sur cet appareil</string>
     <string name="service_description">Service d\'assistance à la gestion des scanners</string>
-    <string name="activity_scan_use_zxing">ZXing</string>
-    <string name="activity_scan_pause_camera">Pause</string>
 </resources>
\ No newline at end of file
diff --git a/enioka_scan/src/main/res/values/strings.xml b/enioka_scan/src/main/res/values/strings.xml
index 4e03314f..85ed45d1 100644
--- a/enioka_scan/src/main/res/values/strings.xml
+++ b/enioka_scan/src/main/res/values/strings.xml
@@ -24,18 +24,11 @@
     <!-- Scanner status (Others) -->
     <string name="scanner_status_no_camera">No camera available</string>
 
-    <!-- ZBar specific -->
-    <string name="scanner_camera_open_error_title">Cannot connect to camera service</string>
-    <string name="scanner_camera_open_error">"Please check that no other applications (including scan helpers like ScanWedge) are using the camera. Also check if the Android camera app is working.\nApplication will now crash."</string>
-    <string name="scanner_camera_no_camera">No fallback camera available on device. Please plugin your laser barcode scanner and restart application. Application will now crash.</string>
-
     <!-- Helper activities -->
     <string name="activity_scan_barcode_value_placeholder">10AL9271B2I8</string>
     <string name="activity_scan_scanner_not_initialized">Scanner initialization not started</string>
     <string name="scanner_using_bt_keyboard">Using Bluetooth scanner or keyboard</string>
     <string name="activity_scan_no_compatible_sdk">There are no compatible scanners on this device</string>
-    <string name="activity_scan_use_zxing">ZXing</string>
-    <string name="activity_scan_pause_camera">Pause</string>
 
     <!-- Helper manual scan fragment -->
     <string name="fragment_scan_manual_title">Manual input</string>
diff --git a/enioka_scan_camera/.gitignore b/enioka_scan_camera/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/enioka_scan_camera/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/enioka_scan_camera/src/main/AndroidManifest.xml b/enioka_scan_camera/src/main/AndroidManifest.xml
index e4c70955..5e2c5b79 100644
--- a/enioka_scan_camera/src/main/AndroidManifest.xml
+++ b/enioka_scan_camera/src/main/AndroidManifest.xml
@@ -14,6 +14,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true">
 
-        <activity android:name=".CameraCompatActivity" />
+        <activity
+            android:name=".CameraCompatActivity"
+            android:description="@string/activity_description" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/enioka_scan_camera/src/main/res/layout/dropdown_item.xml b/enioka_scan_camera/src/main/res/layout/dropdown_item.xml
deleted file mode 100644
index d20f0145..00000000
--- a/enioka_scan_camera/src/main/res/layout/dropdown_item.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/textViewItem"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="3dp"
-        android:layout_marginLeft="2dp"
-        android:layout_marginStart="2dp"
-        android:layout_marginTop="3dp"
-        android:ellipsize="none"
-        android:text="90000000055"
-        android:textSize="13dp" />
-
-    <ImageView
-        android:id="@+id/doneImageView"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:src="@drawable/ic_done_black_24dp"/>
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_below="@id/textViewItem"
-        android:background="@android:color/darker_gray" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/enioka_scan_camera/src/main/res/layout/fragment_scan_manual_input.xml b/enioka_scan_camera/src/main/res/layout/fragment_scan_manual_input.xml
deleted file mode 100644
index 027d330c..00000000
--- a/enioka_scan_camera/src/main/res/layout/fragment_scan_manual_input.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:paddingBottom="24dp"
-    android:paddingLeft="24dp"
-    android:paddingRight="24dp"
-    android:paddingTop="24dp">
-
-    <TextView
-        android:id="@+id/scanner_manual_invite"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:text="@string/fragment_scan_manual_invite"
-        android:textSize="16sp"
-        android:textAlignment="center"/>
-
-    <AutoCompleteTextView
-        android:id="@+id/scanner_manual_input"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/scanner_manual_invite"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="25dp"
-        android:gravity="center"
-        android:inputType="textCapCharacters|text"
-        android:hint="@string/fragment_scan_manual_hint"
-        android:textSize="16sp"
-        android:drawableEnd="@drawable/ic_arrow_down_drop_circle_grey600_24dp"
-        android:drawableRight="@drawable/ic_arrow_down_drop_circle_grey600_24dp">
-
-        <requestFocus />
-    </AutoCompleteTextView>
-    <Button
-        android:id="@+id/scanner_manual_bt_ok"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/scanner_manual_input"
-        android:layout_marginBottom="0px"
-        android:layout_marginTop="40dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:minHeight="0dp"
-        android:minWidth="0dp"
-        android:padding="0dp"
-        android:paddingBottom="0px"
-        android:text="@string/fragment_scan_manual_ok"
-        android:textColor="#009688"
-        android:textSize="14sp" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/enioka_scan_camera/src/main/res/values-fr/strings.xml b/enioka_scan_camera/src/main/res/values-fr/strings.xml
index 525c10df..f7d6de7b 100644
--- a/enioka_scan_camera/src/main/res/values-fr/strings.xml
+++ b/enioka_scan_camera/src/main/res/values-fr/strings.xml
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Scanner status -->
-    <string name="scanner_status_WAITING">Scanner en attente de connexion</string>
-    <string name="scanner_status_CONNECTING">Scanner en cours de connexion</string>
-    <string name="scanner_status_RECONNECTING">Scanner déconnecté mais en tentative de reconnexion</string>
-    <string name="scanner_status_CONNECTED">Scanner connecté</string>
-    <string name="scanner_status_INITIALIZING">Scanner en cours d\'initialisation</string>
-    <string name="scanner_status_INITIALIZED">Scanner initialisé</string>
-    <string name="scanner_status_READY">Scanner prêt à être utilisé</string>
-    <string name="scanner_status_SCANNING">Scanner en cours de scanning</string>
-    <string name="scanner_status_PAUSED">Scanner activé mais indisponible</string>
-    <string name="scanner_status_DISABLED">Scanner désactivé et indisponible</string>
-    <string name="scanner_status_FAILURE">Scanner non disponible suite à une erreur critique</string>
-    <string name="scanner_status_DISCONNECTED">Scanner déconnecté définitivement</string>
-    <string name="scanner_status_UNKNOWN">Scanner dans un état inconnu</string>
-    <string name="scanner_status_SERVICE_PROVIDER_SEARCH_OVER">ScannerService a terminé la découverte de providers de scanner</string>
-    <string name="scanner_status_SERVICE_SDK_SEARCH_NOCOMPATIBLE">Aucun scanner de code barre matériel compatible n\'est disponible sur cet appareil</string>
-    <string name="scanner_status_SERVICE_SDK_SEARCH_OVER">Tous les fournisseurs de scanners matériels ont répondu</string>
-
     <!-- Others -->
-    <string name="scanner_camera_no_camera">Aucune caméra disponible. Veuillez brancher votre lecteur laser. L\'application va s\'arrêter.</string>
-    <string name="scanner_camera_open_error">Veuillez vérifier qu\'aucune autre application n\'utilise la caméra (comme ScanWedge, DataWedge…). Vérifiez aussi que la caméra fnction dans l\'application idoine.</string>
-    <string name="scanner_camera_open_error_title">Impossible de se connecter à la caméra</string>
-    <string name="activity_scan_barcode_value_placeholder">10AL9271B2I8</string>
-    <string name="activity_scan_scanner_not_initialized">Initialisation du scanner non commencée</string>
-    <string name="app_name">EniokaScan</string>
-    <string name="scanner_using_bt_keyboard">Utilisation d\'un clavier ou lecteur Bluetooth</string>
+    <string name="app_name">EniokaScan Camera</string>
+    <string name="activity_description">Service d\'assistance à l\'instanciation d\'une camera scanneur.</string>
+
+    <!-- Scanner status (Others) -->
     <string name="scanner_status_no_camera">Aucune caméra disponible</string>
-    <string name="fragment_scan_manual_hint">00000000</string>
-    <string name="fragment_scan_manual_invite">Veuillez saisir la valeur du code barre, puis choisissez un élément parmi les résultats</string>
-    <string name="fragment_scan_manual_ok">Envoyer</string>
-    <string name="fragment_scan_manual_title">Saisie manuelle</string>
-    <string name="activity_scan_no_compatible_sdk">Aucun scanner compatible n\'est disponible sur cet appareil</string>
-    <string name="service_description">Service d\'assistance à la gestion des scanners</string>
+
+    <!-- ZBar specific -->
+    <string name="scanner_camera_open_error_title">Impossible de se connecter à la caméra</string>
+    <string name="scanner_camera_open_error">Veuillez vérifier qu\'aucune autre application n\'utilise la caméra (comme ScanWedge, DataWedge…). Vérifiez aussi que la caméra fnction dans l\'application idoine.</string>
+    <string name="scanner_camera_no_camera">Aucune caméra disponible. Veuillez brancher votre lecteur laser. L\'application va s\'arrêter.</string>
+
+    <!-- Helper activities -->
     <string name="activity_scan_use_zxing">ZXing</string>
     <string name="activity_scan_pause_camera">Pause</string>
 </resources>
\ No newline at end of file
diff --git a/enioka_scan_camera/src/main/res/values/strings.xml b/enioka_scan_camera/src/main/res/values/strings.xml
index 4e03314f..1b916e60 100644
--- a/enioka_scan_camera/src/main/res/values/strings.xml
+++ b/enioka_scan_camera/src/main/res/values/strings.xml
@@ -1,25 +1,6 @@
 <resources>
-    <string name="app_name">EniokaScan</string>
-    <string name="service_description">Helper service for scanner management</string>
-
-    <!-- Scanner status -->
-    <string name="scanner_status_WAITING">Scanner is waiting for a connection</string>
-    <string name="scanner_status_CONNECTING">Scanner is in the process of connecting</string>
-    <string name="scanner_status_RECONNECTING">Scanner disconnected but is trying to reconnect</string>
-    <string name="scanner_status_CONNECTED">Scanner has finished connecting</string>
-    <string name="scanner_status_INITIALIZING">Scanner is in the process of initializing</string>
-    <string name="scanner_status_INITIALIZED">Scanner has finished initializing</string>
-    <string name="scanner_status_READY">Scanner is ready to scan and waiting to be used</string>
-    <string name="scanner_status_SCANNING">Scanner is in the process of scanning</string>
-    <string name="scanner_status_PAUSED">Scanner is enabled but not ready to scan</string>
-    <string name="scanner_status_DISABLED">Scanner has been disabled and cannot be used</string>
-    <string name="scanner_status_FAILURE">Scanner is no longer available after a critical error occurred</string>
-    <string name="scanner_status_DISCONNECTED">Scanner disconnected and can no longer be used</string>
-    <string name="scanner_status_UNKNOWN">Scanner is in an unknown status</string>
-    <!-- Scanner Service status -->
-    <string name="scanner_status_SERVICE_PROVIDER_SEARCH_OVER">ScannerService finished discovering scanner providers</string>
-    <string name="scanner_status_SERVICE_SDK_SEARCH_NOCOMPATIBLE">There are no compatible hardware barcode scanners on this device</string>
-    <string name="scanner_status_SERVICE_SDK_SEARCH_OVER">All hardware scanner providers have reported for duty</string>
+    <string name="app_name">EniokaScan Camera</string>
+    <string name="activity_description">Helper service for camera scanner management</string>
 
     <!-- Scanner status (Others) -->
     <string name="scanner_status_no_camera">No camera available</string>
@@ -30,16 +11,6 @@
     <string name="scanner_camera_no_camera">No fallback camera available on device. Please plugin your laser barcode scanner and restart application. Application will now crash.</string>
 
     <!-- Helper activities -->
-    <string name="activity_scan_barcode_value_placeholder">10AL9271B2I8</string>
-    <string name="activity_scan_scanner_not_initialized">Scanner initialization not started</string>
-    <string name="scanner_using_bt_keyboard">Using Bluetooth scanner or keyboard</string>
-    <string name="activity_scan_no_compatible_sdk">There are no compatible scanners on this device</string>
     <string name="activity_scan_use_zxing">ZXing</string>
     <string name="activity_scan_pause_camera">Pause</string>
-
-    <!-- Helper manual scan fragment -->
-    <string name="fragment_scan_manual_title">Manual input</string>
-    <string name="fragment_scan_manual_invite">Please enter the barcode value, then select one item among the results</string>
-    <string name="fragment_scan_manual_hint">0000000000</string>
-    <string name="fragment_scan_manual_ok">Send</string>
 </resources>