diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
index 4d5e59b..7e0f366 100644
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@@ -22,15 +22,12 @@ ext.versions = [
         // UI libs.
         supportLibs          : '25.1.1',
         picasso              : '2.5.2',
-        rxBinding            : '0.3.0',
         butterKnife          : '7.0.1',
 
         // Reactive.
-        rxJava               : '1.3.0',
         rxJava2              : '2.1.2',
         rxJavaProGuardRules  : '1.1.6.0',
         rxJavaAsyncUtil      : '0.21.0',
-        rxAndroid            : '1.3.0',
         rxAndroid2           : '2.0.1',
 
         // Others.
@@ -78,15 +75,12 @@ ext.libraries = [
         supportVectorDrawable   : "com.android.support:support-vector-drawable:$versions.supportLibs",
         supportAnimatedDrawable : "com.android.support:animated-vector-drawable:$versions.supportLibs",
         picasso                 : "com.squareup.picasso:picasso:$versions.picasso",
-        rxBinding               : "com.jakewharton.rxbinding:rxbinding:$versions.rxBinding",
         butterKnife             : "com.jakewharton:butterknife:$versions.butterKnife",
 
         // Reactive.
-        rxJava                  : "io.reactivex:rxjava:$versions.rxJava",
         rxJava2                 : "io.reactivex.rxjava2:rxjava:$versions.rxJava2",
         rxJavaAsyncUtil         : "io.reactivex:rxjava-async-util:$versions.rxJavaAsyncUtil",
         rxJavaProGuardRules     : "com.artemzin.rxjava:proguard-rules:$versions.rxJavaProGuardRules",
-        rxAndroid               : "io.reactivex:rxandroid:$versions.rxAndroid",
         rxAndroid2              : "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid2",
 
         // Others.
diff --git a/filesystem/build.gradle b/filesystem/build.gradle
index f6f5b3d..71ec1f6 100644
--- a/filesystem/build.gradle
+++ b/filesystem/build.gradle
@@ -5,9 +5,9 @@ version = VERSION_NAME
 
 dependencies {
     implementation libraries.okio
-    implementation libraries.rxJava
     compileOnly libraries.jsr305
     compileOnly libraries.javax
+    implementation libraries.rxJava2
     implementation project(path: ':cache')
     implementation project(path: ':store')
     testImplementation libraries.mockito
diff --git a/filesystem/src/test/java/com/nytimes/android/external/fs3/StoreNetworkBeforeStaleFailTest.java b/filesystem/src/test/java/com/nytimes/android/external/fs3/StoreNetworkBeforeStaleFailTest.java
index af3f400..749cffc 100644
--- a/filesystem/src/test/java/com/nytimes/android/external/fs3/StoreNetworkBeforeStaleFailTest.java
+++ b/filesystem/src/test/java/com/nytimes/android/external/fs3/StoreNetworkBeforeStaleFailTest.java
@@ -53,7 +53,7 @@ public class StoreNetworkBeforeStaleFailTest {
         verify(fetcher, times(1)).fetch(barCode);
     }
 
-    final class TestPersister implements Persister<BufferedSource, BarCode>, RecordProvider<BarCode> {
+    private static final class TestPersister implements Persister<BufferedSource, BarCode>, RecordProvider<BarCode> {
         @Nonnull
         @Override
         public RecordState getRecordState(@Nonnull BarCode barCode) {
diff --git a/middleware-jackson/build.gradle b/middleware-jackson/build.gradle
index 2c2b08a..199bc69 100644
--- a/middleware-jackson/build.gradle
+++ b/middleware-jackson/build.gradle
@@ -9,7 +9,6 @@ dependencies {
     compileOnly libraries.jsr305
     implementation libraries.jacksonCore
     implementation libraries.jacksonDatabind
-    implementation libraries.rxJava
     implementation libraries.okio
     compileOnly libraries.javax
     testImplementation libraries.mockito
diff --git a/middleware-moshi/build.gradle b/middleware-moshi/build.gradle
index e57e1e6..bb6de11 100644
--- a/middleware-moshi/build.gradle
+++ b/middleware-moshi/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     implementation project(path: ':store')
     implementation project(path: ':filesystem')
     implementation libraries.moshi
-    implementation libraries.rxJava
     compileOnly libraries.jsr305
     compileOnly libraries.javax
     testImplementation libraries.mockito
diff --git a/middleware/build.gradle b/middleware/build.gradle
index b4fb7ba..dbd9ab0 100644
--- a/middleware/build.gradle
+++ b/middleware/build.gradle
@@ -9,7 +9,6 @@ dependencies {
     implementation project(path: ':filesystem')
     implementation libraries.okio
     implementation libraries.gson
-    implementation libraries.rxJava
     compileOnly libraries.jsr305
     compileOnly libraries.javax
     testImplementation libraries.mockito
diff --git a/store/build.gradle b/store/build.gradle
index 3a5446b..e40f963 100644
--- a/store/build.gradle
+++ b/store/build.gradle
@@ -25,4 +25,4 @@ apply from: rootProject.file("gradle/maven-push.gradle")
 apply from: rootProject.file("gradle/checkstyle.gradle")
 apply from: rootProject.file("gradle/pmd.gradle")
 targetCompatibility = 1.8
-sourceCompatibility = 1.8
\ No newline at end of file
+sourceCompatibility = 1.8