diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
index d9bfd96..23bc9db 100644
--- a/build-logic/plugins/build.gradle.kts
+++ b/build-logic/plugins/build.gradle.kts
@@ -6,20 +6,6 @@ dependencies {
     implementation(libs.android.gradlePlugin)
     implementation(libs.composeCompiler.gradlePlugin)
     implementation(libs.kotlin.gradlePlugin)
-
-    // TODO: Fixes dependency conflict issues with Dagger/Hilt, re: https://github.com/google/dagger/issues/3068.
-    implementation(libs.javapoet) {
-        because(
-            "Required for fixing dependency conflict with Dagger/Hilt 2.40.2 and above (see https://github.com/google/dagger/issues/3068)"
-        )
-    }
-
-    // TODO: Fixes dependency analysis resolution conflict, re: https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1240
-    implementation(libs.google.guava) {
-        because(
-            "Required for fixing dependency conflict with Dependency Analysis 1.33.0 and above (see https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1240)"
-        )
-    }
 }
 
 gradlePlugin {
diff --git a/build.gradle.kts b/build.gradle.kts
index 0f7f916..545ba7d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,4 +14,7 @@ buildscript {
         mavenCentral()
         gradlePluginPortal()
     }
+    dependencies {
+        classpath(libs.kotlin.metadata.jvm)
+    }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 02a73b5..65b7f66 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,9 +10,7 @@ dagger = "2.59.2"
 kotlinMetadata = "2.4.0"
 dependencyAnalysis = "3.15.0"
 googleAccompanist = "0.36.0"
-googleGuava = "33.6.0-jre"
 googleMaterial = "1.14.0"
-javapoet = "1.13.0"
 junit4 = "4.13.2"
 junitJupiterBom = "6.1.0"
 kotlin = "2.4.0"
@@ -49,7 +47,6 @@ dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 
 # Google
 google-accompanist-systemUiController = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "googleAccompanist" }
-google-guava = { module = "com.google.guava:guava", version.ref = "googleGuava" }
 google-material = { module = "com.google.android.material:material", version.ref = "googleMaterial" }
 
 # Hilt
@@ -58,9 +55,6 @@ hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", ve
 hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" }
 hilt-navigationCompose = { module = "androidx.hilt:hilt-navigation-compose", version = "1.3.0" }
 
-# Java Poet (For fixing dependency issue in Gradle with Dagger/Hilt)
-javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
-
 # JavaX
 javax-inject = { module = "javax.inject:javax.inject", version = "1" }