diff --git a/build.gradle b/build.gradle
index a1a64b785a..9b2ec90ce6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.google.gms:google-services:4.3.5'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
 
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index f3d0a941cd..5bea9521a6 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -315,7 +315,6 @@
     <!-- User Entry -->
     <string name="uel_bolus">BOLO</string>
     <string name="uel_bolus_advisor">CONSIGLIO BOLO</string>
-    <string name="uel_bolus_record">RECORD BOLO</string>
     <string name="uel_extended_bolus">BOLO ESTESO</string>
     <string name="uel_superbolus_tbr">TBR SUPERBOLO</string>
     <string name="uel_carbs">CHO</string>
@@ -380,28 +379,8 @@
     <string name="uel_import_databases">IMPORTA DATABASE</string>
     <string name="uel_otp_export">ESPORTAZIONE OTP</string>
     <string name="uel_otp_reset">RESET OTP</string>
-    <string name="uel_sms_basal">SMS BASALE</string>
-    <string name="uel_sms_bolus">SMS BOLO</string>
-    <string name="uel_sms_cal">SMS CAL</string>
-    <string name="uel_sms_carbs">SMS CHO</string>
-    <string name="uel_sms_extended_bolus">SMS BOLO ESTESO</string>
-    <string name="uel_sms_loop_disabled">SMS LOOP DISABILITATO</string>
-    <string name="uel_sms_loop_enabled">SMS LOOP ABILITATO</string>
-    <string name="uel_sms_loop_resume">SMS RIPRESA LOOP</string>
-    <string name="uel_sms_loop_suspend">SMS SOSPENSIONE LOOP</string>
-    <string name="uel_sms_profile">SMS PROFILO</string>
-    <string name="uel_sms_pump_connect">SMS CONNESSIONE MICRO</string>
-    <string name="uel_sms_pump_disconnect">SMS DISCONNESSIONE MICRO</string>
-    <string name="uel_sms_sms">SMS SMS</string>
-    <string name="uel_sms_tt">SMS TT</string>
-    <string name="uel_tt_deleted_from_ns">TT ELIMINATO DA NS</string>
-    <string name="uel_careportal_deleted_from_ns">PORTALE ELIMINATO DA NS</string>
-    <string name="uel_careportal_from_ns">PORTALE DA NS</string>
-    <string name="uel_tt_from_ns">TT DA NS</string>
-    <string name="uel_tt_canceleted_from_ns">TT CANCELLATO DA NS</string>
     <string name="uel_export_csv">ESPORTA VOCI UTENTE</string>
     <string name="uel_unknown">SCONOSCIUTO</string>
-    <string name="formated_string">Stringa formattata</string>
     <string name="ue_export_to_csv">Esporta voci utente in Excel (csv)</string>
     <string name="ue_csv_header">"Timestamp;Date;UTC Offset;Action;Note;Value;Unit"</string>
     <plurals name="days">
diff --git a/dana/build.gradle b/dana/build.gradle
index 14391efbea..33b66a5090 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -28,5 +28,4 @@ dependencies {
     api "androidx.room:room-runtime:$room_version"
     api "androidx.room:room-rxjava2:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
-    kapt "android.arch.persistence.room:compiler:$room_version"
 }
\ No newline at end of file
diff --git a/database/build.gradle b/database/build.gradle
index d41e263136..2a52ba112d 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     api "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     /* Database schema export */
-    kapt "android.arch.persistence.room:compiler:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     implementation "androidx.room:room-rxjava2:$room_version"
 
diff --git a/insight/build.gradle b/insight/build.gradle
index 14391efbea..33b66a5090 100644
--- a/insight/build.gradle
+++ b/insight/build.gradle
@@ -28,5 +28,4 @@ dependencies {
     api "androidx.room:room-runtime:$room_version"
     api "androidx.room:room-rxjava2:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
-    kapt "android.arch.persistence.room:compiler:$room_version"
 }
\ No newline at end of file