diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b38a24877..5445d87e4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -112,7 +112,6 @@ androidComponents {
 dependencies {
   kapt(libs.androidx.room.compiler)
   kapt(libs.hilt.android.compiler)
-  implementation(libs.androidx.appcompat)
   implementation(libs.androidx.constraintlayout)
   implementation(libs.androidx.core.ktx)
   implementation(libs.androidx.lifecycle.livedata.ktx)
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 6bffeab9a..1566a3b21 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -63,4 +63,14 @@
 -keep class com.google.gson.examples.android.model.** { *; }
 ##---------------End: proguard configuration for Gson  ----------
 
-
+##---------------Begin: proguard configuration for OkHttp  ----------
+# Don't warn on unused classes.
+# See: https://github.com/square/okhttp/issues/6258
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.*
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
+##---------------End: proguard configuration for OkHttp  ----------
diff --git a/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/TestUtils.kt b/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/TestUtils.kt
index 4d0a17f19..c3fa8c903 100644
--- a/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/TestUtils.kt
+++ b/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/TestUtils.kt
@@ -16,9 +16,7 @@
 
 package com.google.samples.apps.sunflower.utilities
 
-import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.widget.Toolbar
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
 import com.google.samples.apps.sunflower.data.GardenPlanting
@@ -58,12 +56,6 @@ val testGardenPlanting = GardenPlanting(testPlant.plantId, testCalendar, testCal
  */
 val testPlantAndGardenPlanting = PlantAndGardenPlantings(testPlant, listOf(testGardenPlanting))
 
-/**
- * Returns the content description for the navigation button view in the toolbar.
- */
-fun getToolbarNavigationContentDescription(activity: Activity, toolbarId: Int) =
-    activity.findViewById<Toolbar>(toolbarId).navigationContentDescription as String
-
 /**
  * Simplify testing Intents with Chooser
  *
@@ -72,4 +64,4 @@ fun getToolbarNavigationContentDescription(activity: Activity, toolbarId: Int) =
 fun chooser(matcher: Matcher<Intent>): Matcher<Intent> = allOf(
     hasAction(Intent.ACTION_CHOOSER),
     hasExtra(`is`(Intent.EXTRA_INTENT), matcher)
-)
\ No newline at end of file
+)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9179af8c1..d78f30516 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,6 @@
 accessibilityTestFramework = "4.0.0"
 activityCompose = "1.7.2"
 androidGradlePlugin = "8.0.2"
-appcompat = "1.6.1"
 benchmark = "1.1.0"
 # @keep
 compileSdk = "33"
@@ -67,7 +66,6 @@ systemuicontroller = "0.30.1"
 accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" }
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }