diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 75a6bd5da..e8b5054d3 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -11,11 +11,6 @@
     public static final ** CREATOR;
 }
 
-# https://issuetracker.google.com/347963245
--keep class * extends androidx.room.RoomDatabase {
-    <init>();
-}
-
 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 57bd6c5e3..7974338f0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,15 +4,6 @@ pluginManagement {
         google()
         mavenCentral()
     }
-    // TODO: Remove when bundled R8 is updated
-    buildscript {
-        repositories {
-            maven("https://storage.googleapis.com/r8-releases/raw")
-        }
-        dependencies {
-            classpath("com.android.tools:r8:8.6.12-dev")
-        }
-    }
 }
 
 dependencyResolutionManagement {