diff --git a/app/src/main/java/com/aws/amazonlocation/utils/GeneralUtils.kt b/app/src/main/java/com/aws/amazonlocation/utils/GeneralUtils.kt
index 85f95315..066de114 100644
--- a/app/src/main/java/com/aws/amazonlocation/utils/GeneralUtils.kt
+++ b/app/src/main/java/com/aws/amazonlocation/utils/GeneralUtils.kt
@@ -6,7 +6,6 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
-import android.content.res.Resources
 import android.graphics.Color
 import android.graphics.Typeface
 import android.net.ConnectivityManager
@@ -51,7 +50,6 @@ import com.aws.amazonlocation.ui.main.web_view.WebViewActivity
 import java.util.Locale
 import java.util.regex.Matcher
 import java.util.regex.Pattern
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
@@ -187,7 +185,6 @@ fun changeConditionPrivacyColor(conditionPrivacy: AppCompatTextView) {
 }
 
 @ExcludeFromJacocoGeneratedReport
-@ExperimentalCoroutinesApi
 @CheckResult
 fun EditText.textChanges(): Flow<CharSequence?> {
     return callbackFlow {
diff --git a/app/src/main/res/values-ar/string.xml b/app/src/main/res/values-ar/string.xml
index 67311c67..89ceb2ee 100644
--- a/app/src/main/res/values-ar/string.xml
+++ b/app/src/main/res/values-ar/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">أنت يستطيعون حذف هؤلاء الموارد خلال ال كومة حذف اختيار أو «إدارة» الموارد» صفحات في ال قائمة طعام في ال يسار.</string>
   <string name="how_to_connect_2_1">قم بالاتصال ال تجريبي التطبيق مع ال حديثا تم إنشاؤه الخدمات اللاسلكية المتقدمة الموارد بواسطة نسخ في مدخل الحقول.</string>
   <string name="how_to_connect_2_2">من ك تشكيل السحابة انتاج الجزء نسخ ال موافق اسمه يقيم كما انعكست في ال حق الجزء نموذج (معرف تجمع الهوية) إلخ.). **تعلم المزيد**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">تسجيل الدخول باستخدام ال ولدت مستخدم أوراق اعتماد.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">بواسطة توصيل أنا يوافق إلى Amazon شروط الموقع\n** &amp; الشروط**</string>
   <string name="terms_condition">الشروط &amp; الشروط</string>
   <string name="help">المساعدة</string>
-  <string name="click_here">انقر هنا</string>
   <string name="user_domain">نطاق المستخدم</string>
   <string name="enter_user_domain">أدخل نطاق المستخدم</string>
   <string name="enter_identity_pool_id">أدخل معرف تجمع الهوية</string>
@@ -96,13 +92,11 @@
   <string name="delete">حذف</string>
   <string name="edit_geofence">تحرير السياج الجغرافي</string>
   <string name="label_map_style">خريطة أسلوب</string>
-  <string name="label_map_style_description">تغيير البيانات مزود أيضا يؤثر الأماكن &amp; المسارات API</string>
   <string name="label_enter_identity_pool_id">رجاء يدخل لائق هوية حوض السباحة هوية شخصية</string>
   <string name="label_enter_domain">تم إدخالها مستخدم نطاق هو خطأ</string>
   <string name="label_enter_user_pool_client_id">تم إدخالها مستخدم حوض السباحة عميل هوية شخصية هو خطأ</string>
   <string name="label_enter_user_pool_id">تم إدخالها مستخدم حوض السباحة هوية شخصية هو خطأ</string>
   <string name="label_enter_web_socket_url">تم إدخالها انترنت قابس كهرباء رابط هو خطأ</string>
-  <string name="data_provider">البيانات مزود</string>
   <string name="map_style">خريطة طراز</string>
   <string name="aws_cloudformation">قم بالاتصال ك الخدمات اللاسلكية المتقدمة الحساب</string>
   <string name="label_connected">أنت يكونوا متصل</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">قم بالاتصال الخدمات اللاسلكية المتقدمة الحساب</string>
   <string name="label_preview">استطلاع</string>
   <string name="label_location_permission_denied">الموقع تصريح تم رفضه</string>
-  <string name="label_give_permission">اعطي تصريح</string>
   <string name="label_required_permission">مسافة لا أستطيع هو حسب لو موقع تصريح هو لا منحت. رجاء تمكين موقع تصريح من أجل Amazon الموقع من عند إعدادات</string>
   <string name="label_attribution">الإسناد</string>
   <string name="label_disconnect">قطع الاتصال</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024، Amazon الويب خدمات، شركة أو لها الشركات التابعة. جميع حقوق محجوز.</string>
   <string name="label_terms_desc">بواسطة تنزيل، تثبيت، أو باستخدام ال Amazon الموقع نسخة تجريبية التطبيق، أنت يوافق إلى ال التطبيقات **الشروط &amp; الشروط** من أجل استخدم.</string>
   <string name="label_terms_desc_terms_page">بواسطة تنزيل، تثبيت، أو باستخدام ال Amazon الموقع نسخة تجريبية التطبيق، أنت يوافق إلى ال التطبيقات **الشروط &amp; الشروط** من أجل استخدم.</string>
-  <string name="text_terms_desc_coloured_1">الشروط &amp; الشروط</string>
-  <string name="text_terms_desc_coloured_2">الخدمات اللاسلكية المتقدمة مقبول استخدم السياسة</string>
-  <string name="text_terms_desc_coloured_3">الخدمات اللاسلكية المتقدمة الخصوصية تنويه</string>
-  <string name="label_legal_and_privacy">قانوني و الخصوصية</string>
   <string name="label_version">الإصدار</string>
   <string name="label_sign_out">علامة خارج</string>
   <string name="label_partner_attribution">شريك الإسناد</string>
@@ -181,11 +170,6 @@
   <string name="label_km">كم</string>
   <string name="label_ft">قدم</string>
   <string name="label_mi">ميل</string>
-  <string name="label_provider">الموفر</string>
-  <string name="label_attribute">السمة</string>
-  <string name="label_type">النوع</string>
-  <string name="label_apply_filters">تقدم بطلبك مرشحات</string>
-  <string name="label_clear_selection">واضح اختيار</string>
   <string name="label_style_search_error_title">لا مطابقة الأنماط وجد</string>
   <string name="label_style_search_error_des">يصنع بالتأكيد ك بحث هو توضيح بشكل صحيح و محاولة مرة أخرى، ماركة بالتأكيد أنت يملك طبق ال مناسب فلتر أو إزالة ال فلتر و محاولة مرة أخرى</string>
   <string name="label_clear_filters">واضح مرشحات</string>
diff --git a/app/src/main/res/values-de/string.xml b/app/src/main/res/values-de/string.xml
index c1316779..0bba5ce8 100644
--- a/app/src/main/res/values-de/string.xml
+++ b/app/src/main/res/values-de/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">Du Dose löschen diese Ressourcen durch die stapeln Löschung Option oder \'Verwalten Ressourcen“ Seiten in die Speisekarte auf die links.</string>
   <string name="how_to_connect_2_1">Verbinden die Demo App mit die vor kurzem erstellt AWS Ressourcen von Kopieren in Eingang Felder.</string>
   <string name="how_to_connect_2_2">Von dein Wolkenbildung Ausgang Abschnitt Kopie die entsprechende genannt Werte als reflektiert in die Recht Abschnitt bilden (Identity) Oolid usw.). **Lernen mehr**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">Einloggen unter Verwendung von die generiert Benutzer Referenzen.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">Von verbindend ICH zustimmen zu Amazon Standort\n**Nutzungsbedingungen &amp; Bedingungen**</string>
   <string name="terms_condition">Bedingungen &amp; Bedingungen</string>
   <string name="help">Hilfe</string>
-  <string name="click_here">Klick hier</string>
   <string name="user_domain">Benutzerdomäne</string>
   <string name="enter_user_domain">Geben Sie ein Benutzerdomäne</string>
   <string name="enter_identity_pool_id">Geben Sie ein Identity Oolid</string>
@@ -96,13 +92,11 @@
   <string name="delete">Löschen</string>
   <string name="edit_geofence">Bearbeiten Geofence</string>
   <string name="label_map_style">Karte Stil</string>
-  <string name="label_map_style_description">Ändern Daten Anbieter ebenfalls wirkt Orte &amp; Routen API</string>
   <string name="label_enter_identity_pool_id">Bitte eintragen richtig Identität bündeln id</string>
   <string name="label_enter_domain">Eingetragen Benutzer Domäne ist falsch</string>
   <string name="label_enter_user_pool_client_id">Eingetragen Benutzer bündeln Auftraggeber id ist falsch</string>
   <string name="label_enter_user_pool_id">Eingetragen Benutzer bündeln id ist falsch</string>
   <string name="label_enter_web_socket_url">Eingetragen Netz Steckdose url ist falsch</string>
-  <string name="data_provider">Daten Anbieter</string>
   <string name="map_style">Karte Stil</string>
   <string name="aws_cloudformation">Verbinden dein AWS Konto</string>
   <string name="label_connected">Du sind verbunden</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">Verbinden AWS Konto</string>
   <string name="label_preview">Vorschau</string>
   <string name="label_location_permission_denied">Standort Genehmigung verweigert</string>
-  <string name="label_give_permission">Schenken Genehmigung</string>
   <string name="label_required_permission">Entfernung kann\nicht Sein berechnete wenn Standort Genehmigung ist nicht gewährt. Bitte ermöglichen Standort Genehmigung zum Amazon Standort von Einstellungen</string>
   <string name="label_attribution">Namensnennung</string>
   <string name="label_disconnect">Verbindung trennen</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon Web Dienstleistungen, Inc. oder seine verbundene Unternehmen. Alles Rechte reserviert.</string>
   <string name="label_terms_desc">Von wird heruntergeladen, installieren, oder unter Verwendung von die Amazon Standort Demoversion App, Sie zustimmen zu die Apps\'s **Bedingungen &amp; Bedingungen** zum verwenden.</string>
   <string name="label_terms_desc_terms_page">Von wird heruntergeladen, installieren, oder unter Verwendung von die Amazon Standort Demoversion App, Sie zustimmen zu die Apps\'s **Bedingungen &amp; Bedingungen** zum verwenden.</string>
-  <string name="text_terms_desc_coloured_1">Bedingungen &amp; Bedingungen</string>
-  <string name="text_terms_desc_coloured_2">AWS Annehmbar Benutzen Politik</string>
-  <string name="text_terms_desc_coloured_3">AWS Datenschutz Hinweis</string>
-  <string name="label_legal_and_privacy">Rechtlich und Datenschutz</string>
   <string name="label_version">Version</string>
   <string name="label_sign_out">Schild aus</string>
   <string name="label_partner_attribution">Partnerin Namensnennung</string>
@@ -181,11 +170,6 @@
   <string name="label_km">km</string>
   <string name="label_ft">ft</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">Anbieter</string>
-  <string name="label_attribute">Attribut</string>
-  <string name="label_type">Typ</string>
-  <string name="label_apply_filters">Bewerben Filter</string>
-  <string name="label_clear_selection">Klar Auswahl</string>
   <string name="label_style_search_error_title">Nein übereinstimmende Arten gefunden</string>
   <string name="label_style_search_error_des">Machen sicher dein Suche ist buchstabiert richtig und versuchen wieder machen sicher Sie haben angewandt die aneignen Filter oder entfernen die Filter und versuchen nochmal</string>
   <string name="label_clear_filters">Klar Filter</string>
diff --git a/app/src/main/res/values-es/string.xml b/app/src/main/res/values-es/string.xml
index 43cc39be..7b2a66b1 100644
--- a/app/src/main/res/values-es/string.xml
+++ b/app/src/main/res/values-es/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">Tú poder eliminar estos recursos por la pila eliminación opción o «Gestionar recursos\' páginas en la menú en la izquierda.</string>
   <string name="how_to_connect_2_1">Conéctate la muestra app con la recientemente creado AWS recursos por copiado en entrada campos.</string>
   <string name="how_to_connect_2_2">De vuestro Formación en la nube salida sección copiar la correspondiente llamado valora tan reflejada en la derecha sección formulario (ID de grupo de identidad) etc.). **Aprenda más**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">Iniciar sesión usando la generado usuario credenciales.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">Por conectando YO acordar a Amazon \n**Términos de la ubicación y Condiciones**</string>
   <string name="terms_condition">Términos y Condiciones</string>
   <string name="help">Ayuda</string>
-  <string name="click_here">Haga clic aquí</string>
   <string name="user_domain">Dominio de usuario</string>
   <string name="enter_user_domain">Entrar Dominio de usuario</string>
   <string name="enter_identity_pool_id">Entrar ID de grupo de identidad</string>
@@ -96,13 +92,11 @@
   <string name="delete">Eliminar</string>
   <string name="edit_geofence">Editar Geofence</string>
   <string name="label_map_style">Mapa Estilo</string>
-  <string name="label_map_style_description">Cambiando dato proveedora además afecta Lugares y Rutas API</string>
   <string name="label_enter_identity_pool_id">Por favor entrar apropiado identidad piscina id</string>
   <string name="label_enter_domain">Entró usuario dominio es incorrecta</string>
   <string name="label_enter_user_pool_client_id">Entró usuario piscina cliente id es incorrecta</string>
   <string name="label_enter_user_pool_id">Entró usuario piscina id es incorrecta</string>
   <string name="label_enter_web_socket_url">Entró web toma de corriente URL es incorrecta</string>
-  <string name="data_provider">Datos proveedora</string>
   <string name="map_style">Mapa estilo</string>
   <string name="aws_cloudformation">Conéctate vuestro AWS Cuenta</string>
   <string name="label_connected">Tú somos conectada</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">Conéctate AWS Cuenta</string>
   <string name="label_preview">Vista previa</string>
   <string name="label_location_permission_denied">Ubicación permiso denegado</string>
-  <string name="label_give_permission">Regala permiso</string>
   <string name="label_required_permission">Distancia no puedo estar calculada si ubicación permiso es no concedido. Por favor habilitar ubicación permiso por Amazon Ubicación de Ajustes</string>
   <string name="label_attribution">Atribución</string>
   <string name="label_disconnect">Desconectar</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon Web Servicios, Cía. o sus afiliados. Todos derechos reservado.</string>
   <string name="label_terms_desc">Por descargando, instalar, o usando la Amazon Ubicación Demo Aplicación, tú acordar a la Apps\'s **Términos y Condiciones** por usar.</string>
   <string name="label_terms_desc_terms_page">Por descargando, instalar, o usando la Amazon Ubicación Demo Aplicación, tú acordar a la Apps\'s **Términos y Condiciones** por usar.</string>
-  <string name="text_terms_desc_coloured_1">Términos y Condiciones</string>
-  <string name="text_terms_desc_coloured_2">AWS Aceptable Uso Política</string>
-  <string name="text_terms_desc_coloured_3">AWS Privacidad Aviso</string>
-  <string name="label_legal_and_privacy">Legal y Privacidad</string>
   <string name="label_version">Versión</string>
   <string name="label_sign_out">Signo fuera</string>
   <string name="label_partner_attribution">Socio Atribución</string>
@@ -181,11 +170,6 @@
   <string name="label_km">km</string>
   <string name="label_ft">pies</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">Proveedor</string>
-  <string name="label_attribute">Atributo</string>
-  <string name="label_type">Tipo</string>
-  <string name="label_apply_filters">Aplicar filtra</string>
-  <string name="label_clear_selection">Borrar selección</string>
   <string name="label_style_search_error_title">No a juego estilos encontrado</string>
   <string name="label_style_search_error_des">Hacer Sí, claro vuestro búsqueda es deletreado correctamente y intentar otra vez, hacer Sí, claro tú tener aplicado la apropiado filtrar o retirar la filtrar y intentar nuevamente</string>
   <string name="label_clear_filters">Borrar filtra</string>
diff --git a/app/src/main/res/values-fr/string.xml b/app/src/main/res/values-fr/string.xml
index b729986f..a46c00f5 100644
--- a/app/src/main/res/values-fr/string.xml
+++ b/app/src/main/res/values-fr/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">Vous peut supprimer celles-ci ressources à travers le empiler suppression option ou « Gérer ressources » pages dans le menu sur le gauche.</string>
   <string name="how_to_connect_2_1">Connecter le démo appli avec le récemment créé AWS ressources par copier dans entrée champs.</string>
   <string name="how_to_connect_2_2">À partir de votre Formation dans le cloud sortie section copie le correspondant nommé valeurs comme reflété dans le droit section formulaire (Identité : Oolid etc.). **En savoir plus Plus**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">Se connecter en utilisant le générée utilisateur informations d\'identification.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">Par reliant I d\'accord pour Amazon \n**Termes de l\'emplacement et Conditions**</string>
   <string name="terms_condition">Termes et Conditions</string>
   <string name="help">Aide</string>
-  <string name="click_here">Cliquez ici</string>
   <string name="user_domain">Domaine utilisateur</string>
   <string name="enter_user_domain">Entrez Domaine utilisateur</string>
   <string name="enter_identity_pool_id">Entrez Identité Oolid</string>
@@ -96,13 +92,11 @@
   <string name="delete">Supprimer</string>
   <string name="edit_geofence">Modifier Geofence</string>
   <string name="label_map_style">Carte Style</string>
-  <string name="label_map_style_description">En mutation données fournisseur également affecte Lieux et Itinéraires API</string>
   <string name="label_enter_identity_pool_id">Veuillez entrer correct identité piscine identifiant</string>
   <string name="label_enter_domain">Entré utilisateur domaine est faux</string>
   <string name="label_enter_user_pool_client_id">Entré utilisateur piscine client identifiant est faux</string>
   <string name="label_enter_user_pool_id">Entré utilisateur piscine identifiant est faux</string>
   <string name="label_enter_web_socket_url">Entré web prise url est faux</string>
-  <string name="data_provider">Données fournisseur</string>
   <string name="map_style">Carte style</string>
   <string name="aws_cloudformation">Connecter votre AWS Compte</string>
   <string name="label_connected">Vous sont connecté</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">Connecter AWS Compte</string>
   <string name="label_preview">Aperçu</string>
   <string name="label_location_permission_denied">Emplacement autorisation nié</string>
-  <string name="label_give_permission">Donnez autorisation</string>
   <string name="label_required_permission">Distance ne peut pas être calculé si emplacement autorisation est pas accordé. Veuillez activer emplacement autorisation pour Amazon Emplacement à partir de Réglages</string>
   <string name="label_attribution">Attribution</string>
   <string name="label_disconnect">Déconnecter</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon Web Des services, Inc. ou ses affiliés. Tous droits réservé.</string>
   <string name="label_terms_desc">Par téléchargement, installation, ou en utilisant le Amazon Emplacement Démo Application, vous d\'accord pour le Applis **Termes et Conditions** pour utiliser.</string>
   <string name="label_terms_desc_terms_page">Par téléchargement, installation, ou en utilisant le Amazon Emplacement Démo Application, vous d\'accord pour le Applis **Termes et Conditions** pour utiliser.</string>
-  <string name="text_terms_desc_coloured_1">Termes et Conditions</string>
-  <string name="text_terms_desc_coloured_2">AWS Acceptable Utiliser Politique</string>
-  <string name="text_terms_desc_coloured_3">AWS Confidentialité Notice</string>
-  <string name="label_legal_and_privacy">Légal et Confidentialité</string>
   <string name="label_version">Version</string>
   <string name="label_sign_out">Signe en dehors</string>
   <string name="label_partner_attribution">Partenaire Attribution</string>
@@ -181,11 +170,6 @@
   <string name="label_km">km</string>
   <string name="label_ft">pieds</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">Prestataire</string>
-  <string name="label_attribute">Attribut</string>
-  <string name="label_type">Type</string>
-  <string name="label_apply_filters">Appliquer filtres</string>
-  <string name="label_clear_selection">Transparent sélection</string>
   <string name="label_style_search_error_title">Non appariement styles trouvé</string>
   <string name="label_style_search_error_des">Fabriquer sûr votre chercher est orthographié correctement et essayer encore une fois, faire sûr vous avoir appliqué le approprié filtre ou supprimer le filtre et essayer encore</string>
   <string name="label_clear_filters">Transparent filtres</string>
diff --git a/app/src/main/res/values-hi/string.xml b/app/src/main/res/values-hi/string.xml
index 304a22fe..50d850e2 100644
--- a/app/src/main/res/values-hi/string.xml
+++ b/app/src/main/res/values-hi/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">आप कर सकते हैं हटाना ये साधनों से यह ढेर विलोपन विकल्प या \'मैनेज करें संसाधन\' पृष्ठों में यह मेन्यू के ऊपर यह छोड़ दिया है।</string>
   <string name="how_to_connect_2_1">कनेक्ट करें यह प्रदर्शन ऐप साथ यह हाल ही में बनाया था एडब्ल्यूएस साधनों द्वारा नकल में इनपुट फ़ील्ड।</string>
   <string name="how_to_connect_2_2">से तुम्हारा क्लाउड फ़ॉर्मेशन आउटपुट अनुभाग कॉपी करें यह इसी नामित मान जैसा परिलक्षित होता है में यह दाएँ अनुभाग प्रपत्र (आइडेंटिटीपूलिड आदि)। **सीखें अधिक**।</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">लॉगइन इस्तेमाल करते हुए यह उत्पन्न हुआ उपभोक्ता क्रेडेंशियल्स।</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">द्वारा जोड़ने मैं सहमत हैं को Amazon स्थान की\n**शर्तें &amp; शर्तें**</string>
   <string name="terms_condition">शर्तें &amp; शर्तेँ</string>
   <string name="help">मदद</string>
-  <string name="click_here">क्लिक करें इधर</string>
   <string name="user_domain">यूज़र डोमेन</string>
   <string name="enter_user_domain">दर्ज करें यूज़र डोमेन</string>
   <string name="enter_identity_pool_id">दर्ज करें आइडेंटिटी पूलिड</string>
@@ -96,13 +92,11 @@
   <string name="delete">डिलीट करें</string>
   <string name="edit_geofence">संपादित करें जियोफेंस</string>
   <string name="label_map_style">नक्शा स्टाइल</string>
-  <string name="label_map_style_description">बदल रहा है डेटा प्रदाता भी प्रभावित करता है प्लेसेस &amp; रूट्स एपीआई</string>
   <string name="label_enter_identity_pool_id">कृपया दर्ज करें उचित पहचान पूल आईडी</string>
   <string name="label_enter_domain">दर्ज किया गया उपभोक्ता डोमेन है गलत</string>
   <string name="label_enter_user_pool_client_id">दर्ज किया गया उपभोक्ता पूल ग्राहक आईडी है गलत</string>
   <string name="label_enter_user_pool_id">दर्ज किया गया उपभोक्ता पूल आईडी है गलत</string>
   <string name="label_enter_web_socket_url">दर्ज किया गया वेब सॉकेट यूआरएल है गलत</string>
-  <string name="data_provider">डेटा प्रदाता</string>
   <string name="map_style">नक्शा अंदाज</string>
   <string name="aws_cloudformation">कनेक्ट करें तुम्हारा एडब्ल्यूएस अकाउंट</string>
   <string name="label_connected">आप हैं जुड़े हुए</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">कनेक्ट करें एडब्ल्यूएस अकाउंट</string>
   <string name="label_preview">पूर्वावलोकन</string>
   <string name="label_location_permission_denied">लोकेशन अनुमति इनकार किया</string>
-  <string name="label_give_permission">दे अनुमति</string>
   <string name="label_required_permission">दूरी कर सकते हैं\ नहीं होना गणना की अगर स्थान अनुमति है ना दी। कृपया सक्षम स्थान अनुमति के लिए Amazon लोकेशन से सेटिंग</string>
   <string name="label_attribution">एट्रिब्यूशन</string>
   <string name="label_disconnect">डिस्कनेक्ट करें</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon वेब सेवाएँ, निगमित या इसके सहयोगी कंपनियों। सभी अधिकार आरक्षित।</string>
   <string name="label_terms_desc">द्वारा डाउनलोड कर रहा है, स्थापित कर रहा है, या इस्तेमाल करते हुए यह Amazon लोकेशन डेमो ऐप, आप सहमत हैं को यह ऐप्लिकेशन\'s **शर्तें &amp; शर्तें** के लिए उपयोग करें।</string>
   <string name="label_terms_desc_terms_page">द्वारा डाउनलोड कर रहा है, स्थापित कर रहा है, या इस्तेमाल करते हुए यह Amazon लोकेशन डेमो ऐप, आप सहमत हैं को यह ऐप्लिकेशन\'s **शर्तें &amp; शर्तें** के लिए उपयोग करें।</string>
-  <string name="text_terms_desc_coloured_1">शर्तें &amp; शर्तेँ</string>
-  <string name="text_terms_desc_coloured_2">एडब्ल्यूएस स्वीकार्य उपयोग करें पॉलिसी</string>
-  <string name="text_terms_desc_coloured_3">एडब्ल्यूएस प्राइवेसी नोटिस</string>
-  <string name="label_legal_and_privacy">लीगल और प्राइवेसी</string>
   <string name="label_version">वर्ज़न</string>
   <string name="label_sign_out">साइन इन करें बाहर</string>
   <string name="label_partner_attribution">पार्टनर एट्रिब्यूशन</string>
@@ -181,11 +170,6 @@
   <string name="label_km">किमी</string>
   <string name="label_ft">फुट</string>
   <string name="label_mi">मील</string>
-  <string name="label_provider">प्रोवाइडर</string>
-  <string name="label_attribute">गुण</string>
-  <string name="label_type">टाइप करें</string>
-  <string name="label_apply_filters">लागू करें फिल्टर</string>
-  <string name="label_clear_selection">साफ़ करें चुनना</string>
   <string name="label_style_search_error_title">नहीं मिलान शैलियों पाया</string>
   <string name="label_style_search_error_des">बनाओ ज़रूर तुम्हारा तलाश है वर्तनी सही ढंग से और कोशिश करो फिर से, बनाना ज़रूर आप है लागू किया यह उचित फ़िल्टर करें या हटाना यह फ़िल्टर करें और कोशिश करो फिर से</string>
   <string name="label_clear_filters">साफ़ करें फिल्टर</string>
diff --git a/app/src/main/res/values-it/string.xml b/app/src/main/res/values-it/string.xml
index 48d90837..bc78d72d 100644
--- a/app/src/main/res/values-it/string.xml
+++ b/app/src/main/res/values-it/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">Tu lattina eliminare questi risorse attraverso lo pila cancellazione opzione o \'Gestisci risorse» pagine nel lo menù sul lo sinistra.</string>
   <string name="how_to_connect_2_1">Connetti lo manifestazione app con lo recentemente creato AWS risorse da copiando nel ingresso campi.</string>
   <string name="how_to_connect_2_2">Da tuo Formazione sul cloud produzione sezione copia lo corrispondenti denominato valori come riflessa nel lo destra sezione modulo (ID del pool di identità) ecc.). **Impara altro**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">Accedi utilizzando lo generato utente credenziali.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">Di collegando IO concordare a Amazon \n**Termini della sede &amp; Condizioni**</string>
   <string name="terms_condition">Termini &amp; Condizioni</string>
   <string name="help">Aiuto</string>
-  <string name="click_here">Fare clic qui</string>
   <string name="user_domain">Dominio utente</string>
   <string name="enter_user_domain">Entra Dominio utente</string>
   <string name="enter_identity_pool_id">Entra ID del pool di identità</string>
@@ -96,13 +92,11 @@
   <string name="delete">Elimina</string>
   <string name="edit_geofence">Modifica Geofence</string>
   <string name="label_map_style">Mappa Stile</string>
-  <string name="label_map_style_description">Cambiando dato fornitore anche colpisce Luoghi &amp; Percorsi API</string>
   <string name="label_enter_identity_pool_id">Per favore inserire corretto identità piscina id</string>
   <string name="label_enter_domain">Entrato utente dominio è sbagliato</string>
   <string name="label_enter_user_pool_client_id">Entrato utente piscina cliente id è sbagliato</string>
   <string name="label_enter_user_pool_id">Entrato utente piscina id è sbagliato</string>
   <string name="label_enter_web_socket_url">Entrato web presa di corrente url è sbagliato</string>
-  <string name="data_provider">Dati fornitore</string>
   <string name="map_style">Mappa stile</string>
   <string name="aws_cloudformation">Connetti tuo AWS Account</string>
   <string name="label_connected">Tu siamo connesso</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">Connetti AWS Account</string>
   <string name="label_preview">Anteprima</string>
   <string name="label_location_permission_denied">Posizione autorizzazione negato</string>
-  <string name="label_give_permission">Dare autorizzazione</string>
   <string name="label_required_permission">Distanza non posso essere calcolato se posizione autorizzazione è non concesso. Per favore abilitare posizione autorizzazione per Amazon Posizione da Impostazioni</string>
   <string name="label_attribution">Attribuzione</string>
   <string name="label_disconnect">Disconnetti</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon Web Servizi, Inc. o la sua affiliati. Tutti diritti riservato.</string>
   <string name="label_terms_desc">Di scaricamento, installazione, o utilizzando lo Amazon Posizione Dimostrazione App, voi concordare a lo App **Termini &amp; Condizioni** per uso.</string>
   <string name="label_terms_desc_terms_page">Di scaricamento, installazione, o utilizzando lo Amazon Posizione Dimostrazione App, voi concordare a lo App **Termini &amp; Condizioni** per uso.</string>
-  <string name="text_terms_desc_coloured_1">Termini &amp; Condizioni</string>
-  <string name="text_terms_desc_coloured_2">AWS Accettabile Usa Politica</string>
-  <string name="text_terms_desc_coloured_3">AWS Privacy Avviso</string>
-  <string name="label_legal_and_privacy">Legale e Privacy</string>
   <string name="label_version">Versione</string>
   <string name="label_sign_out">Segno fuori</string>
   <string name="label_partner_attribution">Partner Attribuzione</string>
@@ -181,11 +170,6 @@
   <string name="label_km">km</string>
   <string name="label_ft">piedi</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">Fornitore</string>
-  <string name="label_attribute">Attributo</string>
-  <string name="label_type">Tipo</string>
-  <string name="label_apply_filters">Applica filtri</string>
-  <string name="label_clear_selection">Trasparente selezione</string>
   <string name="label_style_search_error_title">No accoppiamento stili trovato</string>
   <string name="label_style_search_error_des">Marca sicuro tuo ricerca è scritto correttamente e provare ancora, fare sicuro voi avere applicata lo apposito filtro o rimuovere lo filtro e provare nuovamente</string>
   <string name="label_clear_filters">Trasparente filtri</string>
diff --git a/app/src/main/res/values-iw/string.xml b/app/src/main/res/values-iw/string.xml
index 923ad4eb..a35eb83d 100644
--- a/app/src/main/res/values-iw/string.xml
+++ b/app/src/main/res/values-iw/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">אתה מסוגל למחוק אלו משאבים דרך ה ערימה מחיקה אפשרות או \'לנהל משאבים עמודים בתוך ה תפריט על ה שמאלה.</string>
   <string name="how_to_connect_2_1">התחבר ה דמו יישום עם ה לאחרונה נברא AWS משאבים על ידי להעתיק בתוך להזין שדות.</string>
   <string name="how_to_connect_2_2">מ שלך תצורת ענן פלט קטע העתק ה תואם בשם ערכים בתור משתקף בתוך ה ימין קטע טופס (זהותPoolid וכו \'). **למד יותר**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">התחברות לנצל ה נוצר משתמש אישורים.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">על ידי מקשר אנוכי מסכים כדי Amazon תנאי\n** של המיקום &amp; תנאים**</string>
   <string name="terms_condition">תנאים &amp; תנאים</string>
   <string name="help">עזרה</string>
-  <string name="click_here">לחץ פה</string>
   <string name="user_domain">דומיין משתמש</string>
   <string name="enter_user_domain">הזן דומיין משתמש</string>
   <string name="enter_identity_pool_id">הזן זיהויPoolid</string>
@@ -96,13 +92,11 @@
   <string name="delete">מחק</string>
   <string name="edit_geofence">עריכה גיאופנס</string>
   <string name="label_map_style">מפה סגנון</string>
-  <string name="label_map_style_description">משתנה פרטים ספק וכן משפיע מקומות &amp; מסלולים ממשק תכנות יישומים</string>
   <string name="label_enter_identity_pool_id">נא הכנס ראוי זהות בריכה מזהה</string>
   <string name="label_enter_domain">נכנס משתמש תחום הווה שגוי</string>
   <string name="label_enter_user_pool_client_id">נכנס משתמש בריכה לקוח מזהה הווה שגוי</string>
   <string name="label_enter_user_pool_id">נכנס משתמש בריכה מזהה הווה שגוי</string>
   <string name="label_enter_web_socket_url">נכנס אינטרנט שקע כתובת אתר הווה שגוי</string>
-  <string name="data_provider">נתונים ספק</string>
   <string name="map_style">מפה סגנון</string>
   <string name="aws_cloudformation">התחבר שלך AWS חשבון</string>
   <string name="label_connected">אתה מהווים מחובר</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">התחבר AWS חשבון</string>
   <string name="label_preview">תצוגה מקדימה</string>
   <string name="label_location_permission_denied">מיקום רשות נדחה</string>
-  <string name="label_give_permission">תן רשות</string>
   <string name="label_required_permission">מרחק יכול\ לא להיות מחושב אם מקום רשות הווה לא הוענקה. נא להפעיל מקום רשות בשביל Amazon מיקום מ הגדרות</string>
   <string name="label_attribution">ייחוס</string>
   <string name="label_disconnect">התנתק</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon אינטרנט שירותים, "בע""מ" או שלו שותפים. כל זכויות שמורה.</string>
   <string name="label_terms_desc">על ידי הורדה, התקנה, או לנצל ה Amazon מיקום הדגמה אפליקציה, אתה מסכים כדי ה אפליקציות\ **תנאים &amp; תנאים** בשביל להשתמש.</string>
   <string name="label_terms_desc_terms_page">על ידי הורדה, התקנה, או לנצל ה Amazon מיקום הדגמה אפליקציה, אתה מסכים כדי ה אפליקציות\ **תנאים &amp; תנאים** בשביל להשתמש.</string>
-  <string name="text_terms_desc_coloured_1">תנאים &amp; תנאים</string>
-  <string name="text_terms_desc_coloured_2">AWS מקובל השתמש מדיניות</string>
-  <string name="text_terms_desc_coloured_3">AWS פרטיות שימו לב</string>
-  <string name="label_legal_and_privacy">משפטי ו פרטיות</string>
   <string name="label_version">גרסה</string>
   <string name="label_sign_out">לחתום החוצה</string>
   <string name="label_partner_attribution">פרטנר ייחוס</string>
@@ -181,11 +170,6 @@
   <string name="label_km">"ק""מ"</string>
   <string name="label_ft">רגל</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">ספק</string>
-  <string name="label_attribute">תכונה</string>
-  <string name="label_type">הקלד</string>
-  <string name="label_apply_filters">הגש בקשה מסננים</string>
-  <string name="label_clear_selection">ברור בחירה</string>
   <string name="label_style_search_error_title">לא זיווג סגנונות נמצא</string>
   <string name="label_style_search_error_des">לעשות בטח שלך חפש הווה מאוית נכון ו השתדל שוב, עשה בטח אתה יש הגיש בקשה ה ראוי מסנן או הסר ה מסנן ו השתדל שוב</string>
   <string name="label_clear_filters">ברור מסננים</string>
diff --git a/app/src/main/res/values-ja/string.xml b/app/src/main/res/values-ja/string.xml
index 450da437..d8ece57a 100644
--- a/app/src/main/res/values-ja/string.xml
+++ b/app/src/main/res/values-ja/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">あなた できます 削除する これら リソース を通して その スタック 削除 オプション または \'管理 リソース \' ページ数 に その メニュー オン その 左。</string>
   <string name="how_to_connect_2_1">接続 その デモ アプリ と その 最近です 作成した AWS リソース によって コピー に 入力 畑。</string>
   <string name="how_to_connect_2_2">から きみの クラウド形成 出力 セクション コピーします その 対応する 名前付き 値 なので 反映 に その 右 セクション フォーム (ID プール ID など)。 **学習 もっと**。</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">ログイン を使用します その 生成された ユーザー 資格情報。</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">によって 接続する 私 同意する に Amazon 場所の\n**規約 &amp; 条件**</string>
   <string name="terms_condition">規約 &amp; 条件</string>
   <string name="help">ヘルプ</string>
-  <string name="click_here">クリック ここに</string>
   <string name="user_domain">ユーザードメイン</string>
   <string name="enter_user_domain">[入力] ユーザードメイン</string>
   <string name="enter_identity_pool_id">[入力] ID プール ID</string>
@@ -96,13 +92,11 @@
   <string name="delete">[削除]</string>
   <string name="edit_geofence">[編集] ジオフェンス</string>
   <string name="label_map_style">マップ スタイル</string>
-  <string name="label_map_style_description">変更 データ プロバイダー また 影響する 場所 &amp; ルート API</string>
   <string name="label_enter_identity_pool_id">お願いします 入る 適切な アイデンティティ プール ID</string>
   <string name="label_enter_domain">入力済み ユーザー ドメイン です 間違っています</string>
   <string name="label_enter_user_pool_client_id">入力済み ユーザー プール クライアント ID です 間違っています</string>
   <string name="label_enter_user_pool_id">入力済み ユーザー プール ID です 間違っています</string>
   <string name="label_enter_web_socket_url">入力済み ウェブ ソケット URL です 間違っています</string>
-  <string name="data_provider">[データ] プロバイダー</string>
   <string name="map_style">マップ スタイル</string>
   <string name="aws_cloudformation">接続 きみの AWS 口座</string>
   <string name="label_connected">あなた です 接続されています</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">接続 AWS 口座</string>
   <string name="label_preview">プレビュー</string>
   <string name="label_location_permission_denied">ロケーション 許可 拒否されました</string>
-  <string name="label_give_permission">与える 許可</string>
   <string name="label_required_permission">距離 できない です 計算された もし ロケーション 許可 です じゃない 付与されました。 お願いします 有効にします ロケーション 許可 にとって Amazon ロケーション から [設定]</string>
   <string name="label_attribution">アトリビューション</string>
   <string name="label_disconnect">接続解除</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon ウェブ サービス、 インコーポレイテッド または その アフィリエイト。 [すべて] 権利 予約済み。</string>
   <string name="label_terms_desc">によって ダウンロード中、 インストール、 または を使用します その Amazon ロケーション デモ アプリ、 あなた 同意する に その アプリ **規約 &amp; 条件** にとって 使用。</string>
   <string name="label_terms_desc_terms_page">によって ダウンロード中、 インストール、 または を使用します その Amazon ロケーション デモ アプリ、 あなた 同意する に その アプリ **規約 &amp; 条件** にとって 使用。</string>
-  <string name="text_terms_desc_coloured_1">規約 &amp; 条件</string>
-  <string name="text_terms_desc_coloured_2">AWS 許容範囲内 使用 ポリシー</string>
-  <string name="text_terms_desc_coloured_3">AWS プライバシー 通知</string>
-  <string name="label_legal_and_privacy">リーガル そして プライバシー</string>
   <string name="label_version">バージョン</string>
   <string name="label_sign_out">サイン アウト</string>
   <string name="label_partner_attribution">パートナー アトリビューション</string>
@@ -181,11 +170,6 @@
   <string name="label_km">キロ</string>
   <string name="label_ft">フィート</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">プロバイダー</string>
-  <string name="label_attribute">[属性]</string>
-  <string name="label_type">タイプ</string>
-  <string name="label_apply_filters">[適用] フィルター</string>
-  <string name="label_clear_selection">クリア 選択</string>
   <string name="label_style_search_error_title">いいえ マッチング スタイル 見つけた</string>
   <string name="label_style_search_error_des">作る 承知しました きみの 検索 です 綴られた 正しく そして 試してみる もう一度、 作る 承知しました あなた 持っている 適用された その 適切な フィルタ または 削除する その フィルタ そして 試してみる 再び</string>
   <string name="label_clear_filters">クリア フィルター</string>
diff --git a/app/src/main/res/values-ko/string.xml b/app/src/main/res/values-ko/string.xml
index 95382f00..018c7869 100644
--- a/app/src/main/res/values-ko/string.xml
+++ b/app/src/main/res/values-ko/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">당신 양철통 지우다 이들 자원 를 통해 그 스택 삭제 선택권 또는 \'관리 리소스\' 페이지 에서 그 메뉴 ...에 그 왼쪽.</string>
   <string name="how_to_connect_2_1">커넥트 그 데모 앱 와 그 최근에 생성되었습니다 AWS 자원 에 의해 복사 에서 입력 필드.</string>
   <string name="how_to_connect_2_2">에서 당신의 클라우드 포메이션 출력 섹션 복사 그 동 이름이 지정되어 있습니다 가치 같이 반영 에서 그 오른쪽 섹션 형식 (아이덴티티 풀 ID) 등). **알아보기 더보기**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">로그인 를 사용하여 그 생성 사용자 자격 증명.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">에 의해 연결 나는 동의하다 에 Amazon 위치\n**약관 &amp; 조건**</string>
   <string name="terms_condition">약관 &amp; 조건</string>
   <string name="help">도움말</string>
-  <string name="click_here">클릭 이리</string>
   <string name="user_domain">사용자 도메인</string>
   <string name="enter_user_domain">들어가기 사용자 도메인</string>
   <string name="enter_identity_pool_id">들어가기 아이덴티티 풀 ID</string>
@@ -96,13 +92,11 @@
   <string name="delete">삭제</string>
   <string name="edit_geofence">편집 지오펜스</string>
   <string name="label_map_style">지도 스타일</string>
-  <string name="label_map_style_description">변경 데이터 공급자 또한 영향을 미친다 장소 &amp; 노선 API</string>
   <string name="label_enter_identity_pool_id">부디 를 입력합니다 적절한 신원을 확인합니다 풀 id</string>
   <string name="label_enter_domain">입력됨 사용자 도메인 입니다 잘못된</string>
   <string name="label_enter_user_pool_client_id">입력됨 사용자 풀 고객 id 입니다 잘못된</string>
   <string name="label_enter_user_pool_id">입력됨 사용자 풀 id 입니다 잘못된</string>
   <string name="label_enter_web_socket_url">입력됨 웹 소켓 url 입니다 잘못된</string>
-  <string name="data_provider">데이터 공급자</string>
   <string name="map_style">지도 스타일</string>
   <string name="aws_cloudformation">커넥트 당신의 AWS 계정</string>
   <string name="label_connected">당신 입니다 연결됨</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">커넥트 AWS 계정</string>
   <string name="label_preview">시사</string>
   <string name="label_location_permission_denied">위치 허가 거부되었습니다</string>
-  <string name="label_give_permission">주기 허가</string>
   <string name="label_required_permission">거리 할 수 없습니다 있다 계획된 만약 위치 허가 입니다 아니 부여됩니다. 부디 활성화하십시오 위치 허가 ...에 대한 Amazon 위치 ...에서 설정</string>
   <string name="label_attribution">저작자 표시</string>
   <string name="label_disconnect">연결 끊기</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon 웹 서비스, 주식회사 또는 그것의 계열사. 모두 권한 예약되어 있습니다.</string>
   <string name="label_terms_desc">에 의해 다운로드, 설치, 또는 를 사용하여 그 Amazon 위치 데모 앱, 당신 동의하다 에 그 앱\ \'의 **약관 &amp; 조건** ...에 대한 용도.</string>
   <string name="label_terms_desc_terms_page">에 의해 다운로드, 설치, 또는 를 사용하여 그 Amazon 위치 데모 앱, 당신 동의하다 에 그 앱\ \'의 **약관 &amp; 조건** ...에 대한 용도.</string>
-  <string name="text_terms_desc_coloured_1">약관 &amp; 조건</string>
-  <string name="text_terms_desc_coloured_2">AWS 수용 가능 용도 정책</string>
-  <string name="text_terms_desc_coloured_3">AWS 프라이버시 공지</string>
-  <string name="label_legal_and_privacy">법률 과 프라이버시</string>
   <string name="label_version">버전</string>
   <string name="label_sign_out">서명 밖으로</string>
   <string name="label_partner_attribution">파트너 저작자 표시</string>
@@ -181,11 +170,6 @@
   <string name="label_km">km</string>
   <string name="label_ft">피트</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">제공자</string>
-  <string name="label_attribute">특성</string>
-  <string name="label_type">타입</string>
-  <string name="label_apply_filters">적용하기 필터</string>
-  <string name="label_clear_selection">투명 선택</string>
   <string name="label_style_search_error_title">아니요 어울리는 스타일 녹이다</string>
   <string name="label_style_search_error_des">만들기 확실한 당신의 수색 입니다 철자 바르게 과 시도해 보십시오 다시 말하지만, 만들 확실한 당신 있다 적용된 그 적절한 필터 또는 제거 그 필터 과 시도해 보십시오 다시</string>
   <string name="label_clear_filters">투명 필터</string>
diff --git a/app/src/main/res/values-pt/string.xml b/app/src/main/res/values-pt/string.xml
index d1f04de3..f76c4371 100644
--- a/app/src/main/res/values-pt/string.xml
+++ b/app/src/main/res/values-pt/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">Você lata deletar estes recursos através a pilha eliminação opção ou “Gerenciar recursos\' páginas em a cardápio em a esquerda.</string>
   <string name="how_to_connect_2_1">Conectar a demonstração aplicativo com a recentemente criada AWS recursos de copiando em entrada campos.</string>
   <string name="how_to_connect_2_2">De seu Formação de nuvem saída seção copiar a correspondente nomeado valores como refletido em a certo seção forma (ID do pool de identidade) etc.). **Aprenda mais**.</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">Login usando a gerada usuária credenciais.</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">Por conectando EU aceita para Amazon \n** Termos da localização &amp; Condições**</string>
   <string name="terms_condition">Termos &amp; Condições</string>
   <string name="help">Socorro</string>
-  <string name="click_here">Clique aqui</string>
   <string name="user_domain">Domínio do usuário</string>
   <string name="enter_user_domain">Entrar Domínio do usuário</string>
   <string name="enter_identity_pool_id">Entrar ID do pool de identidade</string>
@@ -96,13 +92,11 @@
   <string name="delete">Excluir</string>
   <string name="edit_geofence">Editar Geofence</string>
   <string name="label_map_style">Mapa Estilo</string>
-  <string name="label_map_style_description">Mudando dados fornecedor também afeta Lugares &amp; Rotas API</string>
   <string name="label_enter_identity_pool_id">Por favor entrar apropriado identificação piscina id</string>
   <string name="label_enter_domain">Entrou usuária dominar é incorreto</string>
   <string name="label_enter_user_pool_client_id">Entrou usuária piscina cliente id é incorreto</string>
   <string name="label_enter_user_pool_id">Entrou usuária piscina id é incorreto</string>
   <string name="label_enter_web_socket_url">Entrou web soquete url é incorreto</string>
-  <string name="data_provider">Dados fornecedor</string>
   <string name="map_style">Mapa estilizar</string>
   <string name="aws_cloudformation">Conectar seu AWS Conta</string>
   <string name="label_connected">Você está conectado</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">Conectar AWS Conta</string>
   <string name="label_preview">prévia</string>
   <string name="label_location_permission_denied">Localização permissão negado</string>
-  <string name="label_give_permission">Dê permissão</string>
   <string name="label_required_permission">Distância não posso ser calculado E se localização permissão é não concedido. Por favor habilitar localização permissão pelo Amazon Localização desde Configurações</string>
   <string name="label_attribution">Atribuição</string>
   <string name="label_disconnect">Desconectar</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon Web Serviços, Inc. ou dela afiliados. Todos corretos reservado.</string>
   <string name="label_terms_desc">Por baixando, instalando, ou usando a Amazon Localização Demo Aplicativo, você aceita para a Aplicativos **Termos &amp; Condições** pelo usar.</string>
   <string name="label_terms_desc_terms_page">Por baixando, instalando, ou usando a Amazon Localização Demo Aplicativo, você aceita para a Aplicativos **Termos &amp; Condições** pelo usar.</string>
-  <string name="text_terms_desc_coloured_1">Termos &amp; Condições</string>
-  <string name="text_terms_desc_coloured_2">AWS Aceitável Uso Política</string>
-  <string name="text_terms_desc_coloured_3">AWS Privacidade Aviso</string>
-  <string name="label_legal_and_privacy">Legal e Privacidade</string>
   <string name="label_version">Versão</string>
   <string name="label_sign_out">Assinar fora</string>
   <string name="label_partner_attribution">Parceiro Atribuição</string>
@@ -181,11 +170,6 @@
   <string name="label_km">quilômetro</string>
   <string name="label_ft">pés</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">Provedor</string>
-  <string name="label_attribute">Atributo</string>
-  <string name="label_type">Tipo</string>
-  <string name="label_apply_filters">Aplique filtra</string>
-  <string name="label_clear_selection">Claro seleção</string>
   <string name="label_style_search_error_title">Não combinando estilos encontrado</string>
   <string name="label_style_search_error_des">Faça com certeza seu procurar é soletrado corretamente e tentar novamente, fazer com certeza você ter aplicado a apropriado filtrar ou remover a filtrar e tentar de novo</string>
   <string name="label_clear_filters">Claro filtra</string>
diff --git a/app/src/main/res/values-zh-rCN/string.xml b/app/src/main/res/values-zh-rCN/string.xml
index 1c7ede57..b395b3b0 100644
--- a/app/src/main/res/values-zh-rCN/string.xml
+++ b/app/src/main/res/values-zh-rCN/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">你 能够 删除 这些 资源 通过 这 堆 删除 选项 要么 \'管理 资源\' 页面 在 这 菜单 上 这 左。</string>
   <string name="how_to_connect_2_1">连接 这 演示 应用 和 这 最近 创造 AWS 资源 通过 复制 在 输入 字段。</string>
   <string name="how_to_connect_2_2">来自 您的 云形成 输出 部分 复制 这 相应的 被命名 价值 如同 反映 在 这 权利 部分 表单 (identityPoolID 等等）。 **学习 更多**。</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">登录 使用 这 生成的 用户 证书。</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">由 连接 我 同意 到 Amazon 地点的\n**条款 &amp; 条件**</string>
   <string name="terms_condition">条款 &amp; 条件</string>
   <string name="help">帮帮我</string>
-  <string name="click_here">点击 这里</string>
   <string name="user_domain">用户域</string>
   <string name="enter_user_domain">输入 用户域</string>
   <string name="enter_identity_pool_id">输入 identitypoolID</string>
@@ -96,13 +92,11 @@
   <string name="delete">删除</string>
   <string name="edit_geofence">编辑 Geofence</string>
   <string name="label_map_style">地图 风格</string>
-  <string name="label_map_style_description">正在改变 数据 提供者 也 影响 地方 &amp; 路线 API</string>
   <string name="label_enter_identity_pool_id">请 输入 正确的 身份 池 id</string>
   <string name="label_enter_domain">已输入 用户 域 是 错了</string>
   <string name="label_enter_user_pool_client_id">已输入 用户 池 客户 id 是 错了</string>
   <string name="label_enter_user_pool_id">已输入 用户 池 id 是 错了</string>
   <string name="label_enter_web_socket_url">已输入 网站 插座 网址 是 错了</string>
-  <string name="data_provider">数据 提供者</string>
   <string name="map_style">地图 风格</string>
   <string name="aws_cloudformation">连接 您的 AWS 账户</string>
   <string name="label_connected">你 是 连接的</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">连接 AWS 账户</string>
   <string name="label_preview">预览</string>
   <string name="label_location_permission_denied">地点 许可 否认</string>
-  <string name="label_give_permission">给 许可</string>
   <string name="label_required_permission">距离 不能 是 已计算 如果 位置 许可 是 不 授予。 请 启用 位置 许可 为了 Amazon 地点 从 设置</string>
   <string name="label_attribution">归因</string>
   <string name="label_disconnect">断开连接</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024年， Amazon 网页 服务， 公司 要么 它的 附属公司。 全部 权利 保留的。</string>
   <string name="label_terms_desc">由 正在下载， 正在安装， 要么 使用 这 Amazon 地点 演示 应用程序， 你 同意 到 这 应用程序 **条款 &amp; 条件** 为了 使用。</string>
   <string name="label_terms_desc_terms_page">由 正在下载， 正在安装， 要么 使用 这 Amazon 地点 演示 应用程序， 你 同意 到 这 应用程序 **条款 &amp; 条件** 为了 使用。</string>
-  <string name="text_terms_desc_coloured_1">条款 &amp; 条件</string>
-  <string name="text_terms_desc_coloured_2">AWS 可以接受 使用 政策</string>
-  <string name="text_terms_desc_coloured_3">AWS 隐私 通知</string>
-  <string name="label_legal_and_privacy">合法 和 隐私</string>
   <string name="label_version">版本</string>
   <string name="label_sign_out">标志 出</string>
   <string name="label_partner_attribution">合作伙伴 归因</string>
@@ -181,11 +170,6 @@
   <string name="label_km">公里</string>
   <string name="label_ft">英尺</string>
   <string name="label_mi">mi</string>
-  <string name="label_provider">提供商</string>
-  <string name="label_attribute">属性</string>
-  <string name="label_type">键入</string>
-  <string name="label_apply_filters">申请 过滤器</string>
-  <string name="label_clear_selection">清除 选择</string>
   <string name="label_style_search_error_title">没有 匹配 风格 找到</string>
   <string name="label_style_search_error_des">制作 当然 您的 搜索 是 拼出的 正确地 和 尝试 再说一遍， 使 当然 你 有 应用的 这 适当 过滤 要么 去除 这 过滤 和 尝试 再次</string>
   <string name="label_clear_filters">清除 过滤器</string>
diff --git a/app/src/main/res/values-zh-rTW/string.xml b/app/src/main/res/values-zh-rTW/string.xml
index 0cd67b83..298577fe 100644
--- a/app/src/main/res/values-zh-rTW/string.xml
+++ b/app/src/main/res/values-zh-rTW/string.xml
@@ -30,9 +30,6 @@
   <string name="how_to_connect_1_3">你 可以 刪除 這些 資源 通過 該 堆 刪除 選項 或者 \'管理 資源 頁面 在 該 菜單 上 該 左。</string>
   <string name="how_to_connect_2_1">連接 該 演示 應用程式 與 該 最近 已建立 亞馬遜網路服務公司 資源 由 複製 在 輸入 欄位。</string>
   <string name="how_to_connect_2_2">從 你的 雲形成 產量 區段 複製 該 相應的 命名 值 如 反映 在 該 對 區段 形式 (身份類型 等）。 ** 學習 更多 **。</string>
-  <string name="learn_more">
-    <b>Learn more</b>
-  </string>
   <string name="one">1</string>
   <string name="two">2</string>
   <string name="how_to_connect_3_1">登入 運用 該 產生 用戶 認證。</string>
@@ -44,7 +41,6 @@
   <string name="by_connecting_i_agree_to_amazon">通過 連線 我 同意 至 Amazon 地點\n** 條款 &amp; 條件 **</string>
   <string name="terms_condition">條款 &amp; 條件</string>
   <string name="help">幫助</string>
-  <string name="click_here">按一下 這裡</string>
   <string name="user_domain">使用者網域</string>
   <string name="enter_user_domain">輸入 使用者網域</string>
   <string name="enter_identity_pool_id">輸入 身份類型</string>
@@ -96,13 +92,11 @@
   <string name="delete">刪除</string>
   <string name="edit_geofence">編輯 地理圍欄</string>
   <string name="label_map_style">地圖 風格</string>
-  <string name="label_map_style_description">改變 資料 供應商 也 影響 地方 &amp; 路線 應用程式編程介面</string>
   <string name="label_enter_identity_pool_id">求你了 輸入 正確的 身份 池 身份證</string>
   <string name="label_enter_domain">已輸入 用戶 域 是 錯了</string>
   <string name="label_enter_user_pool_client_id">已輸入 用戶 池 客戶 身份證 是 錯了</string>
   <string name="label_enter_user_pool_id">已輸入 用戶 池 身份證 是 錯了</string>
   <string name="label_enter_web_socket_url">已輸入 網路 插座 網址 是 錯了</string>
-  <string name="data_provider">數據 供應商</string>
   <string name="map_style">地圖 風格</string>
   <string name="aws_cloudformation">連接 你的 亞馬遜網路服務公司 帳號</string>
   <string name="label_connected">你 是 連線</string>
@@ -143,7 +137,6 @@
   <string name="connect_to_aws_account">連接 亞馬遜網路服務公司 帳號</string>
   <string name="label_preview">預覽</string>
   <string name="label_location_permission_denied">位置 允許 否認</string>
-  <string name="label_give_permission">給 允許</string>
   <string name="label_required_permission">距離 不能\ 是 計算 如果 地點 允許 是 不 授予。 求你了 啟用 地點 允許 為了 Amazon 位置 從 設定</string>
   <string name="label_attribution">歸因</string>
   <string name="label_disconnect">斷開</string>
@@ -154,10 +147,6 @@
   <string name="label_right_aws">© 2024, Amazon 網頁 服務， 公司 或者 它的 附屬機構。 所有 權利 保留。</string>
   <string name="label_terms_desc">通過 下載， 安裝， 或者 運用 該 Amazon 位置 演示 應用程序， 您 同意 至 該 應用\ 的 ** 條款 &amp; 條件 ** 為了 使用。</string>
   <string name="label_terms_desc_terms_page">通過 下載， 安裝， 或者 運用 該 Amazon 位置 演示 應用程序， 您 同意 至 該 應用\ 的 ** 條款 &amp; 條件 ** 為了 使用。</string>
-  <string name="text_terms_desc_coloured_1">條款 &amp; 條件</string>
-  <string name="text_terms_desc_coloured_2">亞馬遜網路服務公司 可接受 使用 政策</string>
-  <string name="text_terms_desc_coloured_3">亞馬遜網路服務公司 隐私 通知</string>
-  <string name="label_legal_and_privacy">法律 和 隐私</string>
   <string name="label_version">版本</string>
   <string name="label_sign_out">簽署 出</string>
   <string name="label_partner_attribution">夥伴 歸因</string>
@@ -181,11 +170,6 @@
   <string name="label_km">公里</string>
   <string name="label_ft">英呎</string>
   <string name="label_mi">英哩</string>
-  <string name="label_provider">供應商</string>
-  <string name="label_attribute">屬性</string>
-  <string name="label_type">类型</string>
-  <string name="label_apply_filters">申請 過濾器</string>
-  <string name="label_clear_selection">清除 選擇</string>
   <string name="label_style_search_error_title">沒有 匹配 款式 發現</string>
   <string name="label_style_search_error_des">製作 當然 你的 搜尋 是 拼寫 正確地 和 嘗試 再次， 做 當然 您 有 應用的 該 適當的 過濾器 或者 去掉 該 過濾器 和 嘗試 再次</string>
   <string name="label_clear_filters">清除 過濾器</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4068615e..d1638314 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,6 @@
     <string name="how_to_connect_1_3">You can delete these resources through the stack deletion option or ‘Manage resources’ pages in the menu on the left.</string>
     <string name="how_to_connect_2_1">Connect the demo app with the recently created AWS resources by copying in input fields.</string>
     <string name="how_to_connect_2_2">From your CloudFormation output section copy the corresponding named values as reflected in the right section form (IdentityPoolId etc.). **Learn more**.</string>
-    <string name="learn_more"><b>Learn more</b></string>
     <string name="one">1</string>
     <string name="two">2</string>
     <string name="how_to_connect_3_1">Login using the generated user credentials.</string>
@@ -44,7 +43,6 @@
     <string name="by_connecting_i_agree_to_amazon">By connecting I agree to Amazon Location’s\n**Terms &amp; Conditions**</string>
     <string name="terms_condition">Terms &amp; Conditions</string>
     <string name="help">Help</string>
-    <string name="click_here">Click here</string>
     <string name="user_domain">UserDomain</string>
     <string name="enter_user_domain">Enter UserDomain</string>
     <string name="enter_identity_pool_id">Enter IdentityPoolId</string>
@@ -108,7 +106,6 @@
     <string name="delete">Delete</string>
     <string name="edit_geofence">Edit Geofence</string>
     <string name="label_map_style">Map Style</string>
-    <string name="label_map_style_description"><![CDATA[Changing data provider also affects Places & Routes API]]></string>
     <string name="map_standard" translatable="false">Standard</string>
     <string name="map_monochrome" translatable="false">Monochrome</string>
     <string name="map_hybrid" translatable="false">Hybrid</string>
@@ -118,7 +115,6 @@
     <string name="label_enter_user_pool_client_id">Entered user pool client id is wrong</string>
     <string name="label_enter_user_pool_id">Entered user pool id is wrong</string>
     <string name="label_enter_web_socket_url">Entered web socket url is wrong</string>
-    <string name="data_provider">Data provider</string>
     <string name="map_style">Map style</string>
     <string name="aws_cloudformation">Connect your AWS Account</string>
     <string name="label_connected">You are connected</string>
@@ -159,7 +155,6 @@
     <string name="connect_to_aws_account">Connect AWS Account</string>
     <string name="label_preview">Preview</string>
     <string name="label_location_permission_denied">Location permission denied</string>
-    <string name="label_give_permission">Give permission</string>
     <string name="label_required_permission">Distance can\'t be calculated if location permission is not granted. Please enable location permission for Amazon Location from Settings</string>
     <string name="label_attribution">Attribution</string>
     <string name="label_disconnect">Disconnect</string>
@@ -170,10 +165,6 @@
     <string name="label_right_aws">© 2024, Amazon Web Services, Inc. or its affiliates. All rights reserved.</string>
     <string name="label_terms_desc">By downloading, installing, or using the Amazon Location Demo App, you agree to the App\'s **Terms &amp; Conditions** for use.</string>
     <string name="label_terms_desc_terms_page">By downloading, installing, or using the Amazon Location Demo App, you agree to the App\'s **Terms &amp; Conditions** for use.</string>
-    <string name="text_terms_desc_coloured_1">Terms &amp; Conditions</string>
-    <string name="text_terms_desc_coloured_2">AWS Acceptable Use Policy</string>
-    <string name="text_terms_desc_coloured_3">AWS Privacy Notice</string>
-    <string name="label_legal_and_privacy">Legal and Privacy</string>
     <string name="label_version">Version</string>
     <string name="label_sign_out">Sign out</string>
     <string name="label_partner_attribution">Partner Attribution</string>
@@ -197,11 +188,6 @@
     <string name="label_km">km</string>
     <string name="label_ft">ft</string>
     <string name="label_mi">mi</string>
-    <string name="label_provider">Provider</string>
-    <string name="label_attribute">Attribute</string>
-    <string name="label_type">Type</string>
-    <string name="label_apply_filters">Apply view</string>
-    <string name="label_clear_selection">Clear selection</string>
     <string name="label_style_search_error_title">No matching styles found</string>
     <string name="label_style_search_error_des">Make sure your search is spelled correctly and try again, make sure you have applied the appropriate filter or remove the filter and try again</string>
     <string name="label_clear_filters">Clear filters</string>
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/explore/ExploreVMGetAddressLineFromLatLng.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/explore/ExploreVMGetAddressLineFromLatLng.kt
index 9b1cf6b6..f145c864 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/explore/ExploreVMGetAddressLineFromLatLng.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/explore/ExploreVMGetAddressLineFromLatLng.kt
@@ -10,7 +10,6 @@ import com.aws.amazonlocation.domain.`interface`.SearchDataInterface
 import com.aws.amazonlocation.domain.usecase.LocationSearchUseCase
 import com.aws.amazonlocation.mock.*
 import com.aws.amazonlocation.ui.main.explore.ExploreViewModel
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert
 import org.junit.Rule
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceAddTest.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceAddTest.kt
index 8421945d..b97fd560 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceAddTest.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceAddTest.kt
@@ -14,7 +14,6 @@ import com.aws.amazonlocation.mock.NO_DATA_FOUND
 import com.aws.amazonlocation.mock.TEST_DATA_9
 import com.aws.amazonlocation.ui.main.geofence.GeofenceViewModel
 import com.aws.amazonlocation.utils.GeofenceCons
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceDeleteTest.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceDeleteTest.kt
index 3b4bd452..b307950a 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceDeleteTest.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceDeleteTest.kt
@@ -19,7 +19,6 @@ import com.aws.amazonlocation.mock.TEST_DATA_8
 import com.aws.amazonlocation.mock.TEST_DATA_LAT_1
 import com.aws.amazonlocation.mock.TEST_DATA_LNG_1
 import com.aws.amazonlocation.ui.main.geofence.GeofenceViewModel
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceListTest.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceListTest.kt
index 1b2523e4..a7e2cfa5 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceListTest.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMGeofenceListTest.kt
@@ -12,7 +12,6 @@ import com.aws.amazonlocation.mock.NO_DATA_FOUND
 import com.aws.amazonlocation.mock.Responses
 import com.aws.amazonlocation.ui.main.geofence.GeofenceViewModel
 import com.aws.amazonlocation.utils.GeofenceCons
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchSuggestionTest.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchSuggestionTest.kt
index 24921478..eac0ffa0 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchSuggestionTest.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchSuggestionTest.kt
@@ -12,7 +12,6 @@ import com.aws.amazonlocation.mock.DEFAULT_LOCATION
 import com.aws.amazonlocation.mock.Responses
 import com.aws.amazonlocation.mock.SEARCH_TEXT_RIO_TINTO
 import com.aws.amazonlocation.ui.main.geofence.GeofenceViewModel
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchTest.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchTest.kt
index 2ab19e35..7de432c3 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchTest.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/geofence/GeofenceVMSearchTest.kt
@@ -14,7 +14,6 @@ import com.aws.amazonlocation.mock.NO_DATA_FOUND
 import com.aws.amazonlocation.mock.Responses
 import com.aws.amazonlocation.mock.SEARCH_TEXT_RIO_TINTO
 import com.aws.amazonlocation.ui.main.geofence.GeofenceViewModel
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/simulation/SimulationVMGetGeofenceList.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/simulation/SimulationVMGetGeofenceList.kt
index 70921ccc..85c179c6 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/simulation/SimulationVMGetGeofenceList.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/simulation/SimulationVMGetGeofenceList.kt
@@ -12,8 +12,6 @@ import com.aws.amazonlocation.mock.*
 import com.aws.amazonlocation.ui.main.simulation.SimulationViewModel
 import com.aws.amazonlocation.utils.GeofenceCons
 import com.aws.amazonlocation.utils.simulationCollectionName
-import java.util.*
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert
 import org.junit.Rule
diff --git a/app/src/test/java/com/aws/amazonlocation/viewmodel/tracking/TrackingVMGetGeofenceList.kt b/app/src/test/java/com/aws/amazonlocation/viewmodel/tracking/TrackingVMGetGeofenceList.kt
index b0e4b796..098951f6 100644
--- a/app/src/test/java/com/aws/amazonlocation/viewmodel/tracking/TrackingVMGetGeofenceList.kt
+++ b/app/src/test/java/com/aws/amazonlocation/viewmodel/tracking/TrackingVMGetGeofenceList.kt
@@ -11,7 +11,6 @@ import com.aws.amazonlocation.domain.usecase.GeofenceUseCase
 import com.aws.amazonlocation.mock.*
 import com.aws.amazonlocation.ui.main.tracking.TrackingViewModel
 import com.aws.amazonlocation.utils.GeofenceCons
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert
 import org.junit.Rule
@@ -21,7 +20,6 @@ import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.kotlin.any
 import org.robolectric.RobolectricTestRunner
-import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
 class TrackingVMGetGeofenceList : BaseTest() {