diff --git a/.gitmodules b/.gitmodules
index 302a804c46..e69de29bb2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "StickyListHeaders"]
-	path = StickyListHeaders
-	url = git://github.com/mtotschnig/StickyListHeaders.git
-[submodule "dav4android"]
-	path = dav4android
-	url = https://gitlab.com/bitfireAT/dav4android.git
diff --git a/StickyListHeaders b/StickyListHeaders
deleted file mode 160000
index 7c5d2e8347..0000000000
--- a/StickyListHeaders
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7c5d2e834789d17862e6d75c36fef186096b5774
diff --git a/build.gradle b/build.gradle
index 681cfcd546..2ca0ca3ccb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ ext {
     buildToolsVersion = "25.0.2"
     minSdkVersion = 9
     targetSdkVersion = 25
-    androidSupportLibraryVersion = "25.2.0"
+    androidSupportLibraryVersion = "25.3.0"
     espressoVersion = "2.2.2"
     androidSupportTestVersion = "0.5"
     daggerVersion = "2.5"
diff --git a/dav4android b/dav4android
deleted file mode 160000
index 659e820f35..0000000000
--- a/dav4android
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 659e820f357f7552c1ef96f5cd0449d12d743cd0
diff --git a/myExpenses/build.gradle b/myExpenses/build.gradle
index 36fca5aa77..fe35c64943 100644
--- a/myExpenses/build.gradle
+++ b/myExpenses/build.gradle
@@ -93,9 +93,9 @@ dependencies {
     provided 'com.ryanharter.auto.value:auto-value-gson:0.4.6'
     apt 'com.gabrielittner.auto.value:auto-value-cursor:1.0.1'
     compile 'com.gabrielittner.auto.value:auto-value-cursor-annotations:1.0.0'
-    compile project(':StickyListHeaders:library')
+    compile 'com.github.mtotschnig:StickyListHeaders:master-SNAPSHOT'
     compile 'com.pavelsikun:material-seekbar-preference:2.3.0'
-    compile project(':dav4android')
+    compile 'com.gitlab.bitfireAT:dav4android:master-SNAPSHOT'
     compile 'com.android.support:appcompat-v7:' + project.androidSupportLibraryVersion
     compile 'com.android.support:support-v4:' + project.androidSupportLibraryVersion
     compile 'com.android.support:recyclerview-v7:' + project.androidSupportLibraryVersion
diff --git a/settings.gradle b/settings.gradle
index 3a8805d1c4..1cf61b27f8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1 @@
-include ':StickyListHeaders:library'
 include ':myExpenses'
-include ':dav4android'