diff --git a/android/build.gradle b/android/build.gradle
index 035e9ecd0..83939aff9 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -247,10 +247,7 @@ android {
 
     dependencies {
         compileOnly deps.lithoAnnotations
-        compileOnly 'org.glassfish:javax.annotation:10.0-b28'
-
         implementation project(':fbjni')
-
         implementation deps.soloader
         implementation deps.guava
         implementation deps.jsr305
diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index 16d05221a..6d91d2eb2 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -28,29 +28,18 @@ android {
 
 
 dependencies {
-
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    // Android Support Library
     implementation deps.supportAppCompat
-    implementation deps.supportConstraintLayout
-    implementation deps.supportDesign
-    testImplementation deps.junit
-    androidTestImplementation deps.supportTestRunner
-    androidTestImplementation deps.supportEspresso
+
     // Litho
     implementation deps.lithoCore
     implementation deps.lithoWidget
     compileOnly deps.lithoAnnotations
-
     annotationProcessor deps.lithoProcessor
 
-    // SoLoader
+    // Third-party
     implementation deps.soloader
-
-    // For integration with Fresco
-    implementation deps.lithoFresco
-    // For testing
-    testImplementation deps.lithoTesting
-
     implementation deps.okhttp3
+
     implementation project(':android')
 }
diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java b/android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java
index aec4b7828..f3c8ec4a6 100644
--- a/android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java
+++ b/android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java
@@ -2,24 +2,22 @@
 
 package com.facebook.sonar.sample;
 
+import android.util.Log;
+import com.facebook.litho.ClickEvent;
 import com.facebook.litho.Column;
 import com.facebook.litho.Component;
 import com.facebook.litho.ComponentContext;
 import com.facebook.litho.annotations.LayoutSpec;
 import com.facebook.litho.annotations.OnCreateLayout;
+import com.facebook.litho.annotations.OnEvent;
 import com.facebook.litho.widget.Text;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.RequestBody;
-import okhttp3.FormBody;
-import okhttp3.FormBody.Builder;
-import okhttp3.OkHttpClient;
+import java.io.IOException;
 import okhttp3.Call;
 import okhttp3.Callback;
-import com.facebook.litho.ClickEvent;
-import android.util.Log;
-import java.io.IOException;
-import com.facebook.litho.annotations.OnEvent;
+import okhttp3.FormBody;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 
 @LayoutSpec
 public class RootComponentSpec {
diff --git a/build.gradle b/build.gradle
index 10ef1a734..2472c75ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,5 +62,7 @@ ext.deps = [
         robolectric        : 'org.robolectric:robolectric:3.0',
         junit              : 'junit:junit:4.12',
         stetho             : 'com.facebook.stetho:stetho:1.5.0',
-        okhttp3            : 'com.squareup.okhttp3:okhttp:3.10.0'
+        okhttp3            : 'com.squareup.okhttp3:okhttp:3.10.0',
+        // Plugin dependencies
+        rhino              : 'org.mozilla:rhino:1.7.10',
 ]