diff --git a/device/testing/device-samsung-klte/APKBUILD b/device/testing/device-samsung-klte/APKBUILD
index 9184fe76e..d50dcdc71 100644
--- a/device/testing/device-samsung-klte/APKBUILD
+++ b/device/testing/device-samsung-klte/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5"
 pkgver=0.3
-pkgrel=11
+pkgrel=12
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -15,10 +15,6 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-downstream-firmware:downstream_firmware
 	$pkgname-mainline-firmware:mainline_firmware
-	$pkgname-nonfree-userland:nonfree_userland
-	$pkgname-hybris:hybris
-	$pkgname-hybris-x11:hybris_x11
-	$pkgname-hybris-pulse:hybris_pulse
 "
 source="
 	70-klte-android.rules
@@ -87,46 +83,6 @@ mainline_firmware() {
 	mkdir "$subpkgdir"
 }
 
-nonfree_userland() {
-	pkgdesc="Pulls libhybris (Android) hardware adaptation, only for downstream kernel"
-	depends="$pkgname-hybris"
-	mkdir "$subpkgdir"
-}
-
-hybris() {
-	pkgdesc="libhybris (Android) hardware adaptation"
-	depends="hybris-base"
-	install="$pkgname-hybris.post-install"
-
-	mkdir "$subpkgdir"
-
-	# Android mounts (needed for loading firmware and configs from android container)
-	# Appended to fstab in post-install script
-	install -Dm644 "$startdir"/fstab.android "$subpkgdir"/etc/fstab.android
-
-	# Android udev rules, depend on android users and groups presence
-	install -Dm644 "$startdir"/70-klte-android.rules \
-		"$subpkgdir"/etc/udev/rules.d/70-klte-android.rules
-}
-
-hybris_x11() {
-	# Installs libhybris xorg support
-	pkgdesc="x11 modules for libhybris adaptation"
-	depends="hybris-base-x11-caf"
-	install_if="$pkgname-hybris xorg-server"
-
-	mkdir "$subpkgdir"
-}
-
-hybris_pulse() {
-	# Installs libhybris pulseaudio support
-	pkgdesc="pulseaudio modules for libhybris adaptation"
-	depends="alsa-plugins-pulse pulseaudio-modules-droid-7.1-caf"
-	install_if="$pkgname-hybris pulseaudio"
-
-	mkdir "$subpkgdir"
-}
-
 sha512sums="a68734d3fe30695d5a9302c92327e8ca564a73d06f0de87371800d1bdf4c541c3721af380b8d44cfa0b4cc1dc8a71586aec3f00bb877ee9dc18f41ba34caaeff  70-klte-android.rules
 66db173b9f1075a133efeea8bda94ef08089b7c15acbc1e3aefb9f8510daa7690a0ce2739d20647e096ba69940ac5c4c6699f3b032ec67609ca56f116bb25256  battery-status
 c66e0c57e911b644cf6c340ea19ce0a9399b8e9e6cb0da38f612e0f8b3d0812ad109cd7b7506184e840a653397a64e3e57fdc71ab8b0fc52733bf74365b9c0e7  cpufreq.start