diff --git a/database/build.gradle b/database/build.gradle
index 82516d6e33..a524196d9e 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation project(':shared')
 
     api "androidx.core:core-ktx:$core_version"
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     api "io.reactivex.rxjava3:rxjava:$rxjava_version"
     api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
diff --git a/wear/build.gradle b/wear/build.gradle
index 93d9e3281b..2bee9762de 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -96,12 +96,12 @@ dependencies {
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation "androidx.preference:preference-ktx:$preferencektx_version"
+    implementation "androidx.core:core-ktx:$core_version"
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "androidx.preference:preference-ktx:$preferencektx_version"
     implementation 'androidx.wear:wear:1.2.0'
+    implementation "androidx.wear.tiles:tiles:1.0.1"
 
     compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
     implementation "com.google.android.support:wearable:${wearableVersion}"
@@ -114,8 +114,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutines_version"
-    implementation "androidx.core:core-ktx:$core_version"
-    implementation "androidx.wear.tiles:tiles:1.0.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     // for old fashioned support-app version