diff --git a/android/android-base/build.gradle b/android/android-base/build.gradle
index f1967eb3e..9593bfdc9 100644
--- a/android/android-base/build.gradle
+++ b/android/android-base/build.gradle
@@ -6,17 +6,6 @@ android {
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION as Integer
         targetSdkVersion TARGET_SDK_VERSION as Integer
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
     }
 
     compileOptions {
@@ -28,7 +17,6 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
-
 }
 
 dependencies {
@@ -38,14 +26,4 @@ dependencies {
     implementation "org.apache.commons:commons-lang3:3.5"
 
     annotationProcessor "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-    androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-    androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION"
-    testAnnotationProcessor "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-    testImplementation "junit:junit:4.12"
-
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-
-
 }
diff --git a/android/android-pickers/build.gradle b/android/android-pickers/build.gradle
index 41b55a8d5..02f9aaaaf 100644
--- a/android/android-pickers/build.gradle
+++ b/android/android-pickers/build.gradle
@@ -6,16 +6,6 @@ android {
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION as Integer
         targetSdkVersion TARGET_SDK_VERSION as Integer
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
     }
 
     compileOptions {
diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle
index 361ca8190..b4747e66c 100644
--- a/android/uhabits-android/build.gradle
+++ b/android/uhabits-android/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 android {
     compileSdkVersion COMPILE_SDK_VERSION as Integer
 
-    if(project.hasProperty("LOOP_STORE_FILE")) {
+    if (project.hasProperty("LOOP_STORE_FILE")) {
         signingConfigs {
             release {
                 storeFile file(LOOP_STORE_FILE)
@@ -42,6 +42,7 @@ android {
     lintOptions {
         checkReleaseBuilds false
         abortOnError false
+        disable 'GoogleAppIndexingWarning'
     }
 
     compileOptions {
@@ -82,18 +83,18 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
 
     compileOnly "javax.annotation:jsr250-api:1.0"
-    compileOnly "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
+    compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
     kapt "com.jakewharton:butterknife-compiler:9.0.0"
-    annotationProcessor "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
+    annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
 
     androidTestImplementation "com.android.support.test.espresso:espresso-contrib:2.2.2"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:2.2.2"
     androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:2.1.1"
     androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION"
     androidTestImplementation "com.linkedin.testbutler:test-butler-library:1.3.1"
-    androidTestCompileOnly "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
-    androidTestAnnotationProcessor "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
+    androidTestCompileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
+    androidTestAnnotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
     androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
     androidTestImplementation "com.android.support.test:rules:0.5"
     androidTestImplementation "com.android.support.test:runner:0.5"
@@ -120,11 +121,6 @@ dependencies {
     }
 }
 
-repositories {
-    google()
-    jcenter()
-}
-
 kapt {
     correctErrorTypes = true
 }