diff --git a/util-linux/PKGBUILD b/util-linux/PKGBUILD
deleted file mode 100644
index eda0a48..0000000
--- a/util-linux/PKGBUILD
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/bash
-# JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer	: Joe Bo Run <joborun@disroot.org>
-# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
-# Website		: https://pozol.eu
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=util-linux
-pkgname=(util-linux util-linux-libs)
-_pkgmajor=2.38
-_realver=${_pkgmajor}.1
-pkgver=${_realver/-/}
-pkgrel=04
-pkgdesc='Miscellaneous system utilities for Linux w/o systemd'
-url='https://github.com/karelzak/util-linux'
-makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python')
-#options=('debug' 'strip')
-options=(strip)
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign}
-        pam-{login,common,runuser,su}
-        'util-linux.sysusers'
-        '60-rfkill.rules')
-
-#prepare() {
-#  cd "${pkgbase}-${_realver}"
-#
-#  patch -Np1 < ../0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch
-#}
-
-
-#    --disable-raw \
-
-build() {
-  cd "${pkgbase}-${_realver}"
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --bindir=/usr/bin \
-    --sbindir=/usr/bin \
-    --localstatedir=/var \
-    --enable-usrdir-path \
-    --enable-fs-paths-default=/usr/bin:/usr/local/bin \
-    --enable-vipw \
-    --enable-newgrp \
-    --enable-chfn-chsh \
-    --enable-write \
-    --enable-mesg \
-    --with-python=3 \
-    --with-systemdsystemunitdir=no \
-    --with-systemd=no
-
-  make
-}
-
-package_util-linux() {
-  conflicts=('rfkill' 'hardlink')
-  provides=('rfkill' 'hardlink')
-  replaces=('rfkill' 'hardlink')
-  depends=('pam' 'shadow' 'coreutils'
-		'libeudev' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
-           'libmagic.so' 'libncursesw.so')
-  optdepends=('words: default dictionary for look')
-  backup=(etc/pam.d/chfn
-          etc/pam.d/chsh
-          etc/pam.d/login
-          etc/pam.d/runuser
-          etc/pam.d/runuser-l
-          etc/pam.d/su
-          etc/pam.d/su-l)
-
-  _python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
-
-  make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
-
-  # remove static libraries
-  rm "${pkgdir}"/usr/lib/lib*.a*
-
-  # setuid chfn and chsh
-  chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
-
-  # install PAM files for login-utils
-  install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn"
-  install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh"
-  install -m0644 pam-login "${pkgdir}/etc/pam.d/login"
-  install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser"
-  install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l"
-  install -m0644 pam-su "${pkgdir}/etc/pam.d/su"
-  install -m0644 pam-su "${pkgdir}/etc/pam.d/su-l"
-
-  # TODO(dreisner): offer this upstream?
-#  sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
-
-  # runtime libs are shipped as part of util-linux-libs
-  install -d -m0755 util-linux-libs/lib/
-  mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
-  mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
-  mv "$pkgdir"/usr/include util-linux-libs/include
-  mv "$pkgdir"/"${_python_stdlib}"/site-packages util-linux-libs/site-packages
-  rmdir "$pkgdir"/"${_python_stdlib}"
-  mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
-
-  ### install sysusers
-  install -Dm0644 "${srcdir}/util-linux.sysusers" \
-    "${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
-
-  install -Dm0644 "${srcdir}/60-rfkill.rules" \
-    "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
-
-#  install -Dm0644 rfkill-unblock_.service \
-
-#    "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
-#  install -Dm0644 rfkill-block_.service \
-#    "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
-}
-
-package_util-linux-libs() {
-  pkgdesc="util-linux runtime libraries"
-  depends=('glibc')
-  provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-  conflicts=('libutil-linux')
-  replaces=('libutil-linux')
-  optdepends=('python: python bindings to libmount')
-
-  install -d -m0755 "$pkgdir"/{"${_python_stdlib}",usr/share/man/}
-  mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
-  mv util-linux-libs/include "$pkgdir"/usr/include
-  mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
-  mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
-
-}
-
-#---- arch license gpg-key & sha256sums ----
-
-arch=(x86_64)
-
-license=('GPL2')
-
-validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
-
-sha256sums=(60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f # util-linux-2.38.1.tar.xz
-	a912d209b40b997bfbe41c9d444fa003fee9fab74b6aaad30d30ecb40466b02f # util-linux-2.38.1.tar.sign
-	99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f # pam-login
-	57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af # pam-common
-	48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1 # pam-runuser
-	3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b # pam-su
-	10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3 # util-linux.sysusers
-	7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37) #  60-rfkill.rules
-
-##  c120f45f553bf113e8906a7621437493c9c0156f8490e4d282be938acb6104f4  util-linux-2.38.1-04-x86_64.pkg.tar.lz
-##  cdb7eda8737e00659127ef85cdf9c5081d0b7a1638c6024ccf8a388febd4d9d1  util-linux-libs-2.38.1-04-x86_64.pkg.tar.lz
-
diff --git a/util-linux/PKGBUILD-arch b/util-linux/PKGBUILD-arch
deleted file mode 100644
index 89d9bb0..0000000
--- a/util-linux/PKGBUILD-arch
+++ /dev/null
@@ -1,129 +0,0 @@
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgbase=util-linux
-pkgname=(util-linux util-linux-libs)
-_pkgmajor=2.38
-_realver=${_pkgmajor}.1
-pkgver=${_realver/-/}
-pkgrel=4
-pkgdesc='Miscellaneous system utilities for Linux'
-url='https://github.com/karelzak/util-linux'
-arch=('x86_64')
-makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python' 'systemd')
-license=('GPL2')
-options=('strip')
-validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign}
-        pam-{login,common,runuser,su}
-        'util-linux.sysusers'
-        '60-rfkill.rules'
-        'rfkill-unblock_.service'
-        'rfkill-block_.service')
-sha256sums=('60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f'
-            'SKIP'
-            '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
-            '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
-            '48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
-            '3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b'
-            '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
-            '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
-            '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
-            'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
-
-build() {
-  cd "${pkgbase}-${_realver}"
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --bindir=/usr/bin \
-    --sbindir=/usr/bin \
-    --localstatedir=/var \
-    --enable-usrdir-path \
-    --enable-fs-paths-default=/usr/bin:/usr/local/bin \
-    --enable-vipw \
-    --enable-newgrp \
-    --enable-chfn-chsh \
-    --enable-write \
-    --enable-mesg \
-    --with-python=3
-
-  make
-}
-
-package_util-linux() {
-  conflicts=('rfkill' 'hardlink')
-  provides=('rfkill' 'hardlink')
-  replaces=('rfkill' 'hardlink')
-  depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
-           'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
-           'libmagic.so' 'libncursesw.so')
-  optdepends=('words: default dictionary for look')
-  backup=(etc/pam.d/chfn
-          etc/pam.d/chsh
-          etc/pam.d/login
-          etc/pam.d/runuser
-          etc/pam.d/runuser-l
-          etc/pam.d/su
-          etc/pam.d/su-l)
-
-  _python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
-
-  make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
-
-  # remove static libraries
-  rm "${pkgdir}"/usr/lib/lib*.a*
-
-  # setuid chfn and chsh
-  chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
-
-  # install PAM files for login-utils
-  install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn"
-  install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh"
-  install -m0644 pam-login "${pkgdir}/etc/pam.d/login"
-  install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser"
-  install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l"
-  install -m0644 pam-su "${pkgdir}/etc/pam.d/su"
-  install -m0644 pam-su "${pkgdir}/etc/pam.d/su-l"
-
-  # TODO(dreisner): offer this upstream?
-  sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
-
-  # runtime libs are shipped as part of util-linux-libs
-  install -d -m0755 util-linux-libs/lib/
-  mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
-  mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
-  mv "$pkgdir"/usr/include util-linux-libs/include
-  mv "$pkgdir"/"${_python_stdlib}"/site-packages util-linux-libs/site-packages
-  rmdir "$pkgdir"/"${_python_stdlib}"
-  mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
-
-  # install systemd-sysusers
-  install -Dm0644 util-linux.sysusers \
-    "${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
-
-  install -Dm0644 60-rfkill.rules \
-    "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
-
-  install -Dm0644 rfkill-unblock_.service \
-    "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
-  install -Dm0644 rfkill-block_.service \
-    "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
-}
-
-package_util-linux-libs() {
-  pkgdesc="util-linux runtime libraries"
-  depends=('glibc')
-  provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-  conflicts=('libutil-linux')
-  replaces=('libutil-linux')
-  optdepends=('python: python bindings to libmount')
-
-  install -d -m0755 "$pkgdir"/{"${_python_stdlib}",usr/share/man/}
-  mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
-  mv util-linux-libs/include "$pkgdir"/usr/include
-  mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
-  mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
-}
diff --git a/util-linux/PKGBUILD-oba b/util-linux/PKGBUILD-oba
deleted file mode 100644
index c24ae8b..0000000
--- a/util-linux/PKGBUILD-oba
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obcore/util-linux
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=util-linux
-_pkgmajor=2.37
-_realver=${_pkgmajor}.2
-pkgver=${_realver/-/}
-pkgrel=5
-pkgdesc="Miscellaneous system utilities for Linux"
-url='https://github.com/karelzak/util-linux'
-
-pkgname=(
-    'util-linux'
-    'util-linux-libs'
-)
-
-track="v${_pkgmajor}"
-target="$pkgbase-${_realver}"
-source=(
-    "https://www.kernel.org/pub/linux/utils/util-linux/${track}/${target}.tar."{xz,sign}
-    pam-login
-    pam-common
-    pam-runuser
-    pam-su
-    60-rfkill.rules
-    util-linux.sysusers
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'asciidoctor'
-    'libcap-ng'
-    'libxcrypt'
-    'python'
-)
-
-options=(
-    'strip'
-)
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    --prefix=/usr
-    --libdir=/usr/lib
-    --bindir=/usr/bin
-    --sbindir=/usr/bin
-    --localstatedir=/var
-    --enable-usrdir-path
-    --enable-fs-paths-default=/usr/bin:/usr/local/bin
-    --enable-raw
-    --enable-vipw
-    --enable-newgrp
-    --enable-chfn-chsh
-    --enable-write
-    --enable-mesg
-    --with-python=3
-    --with-systemdsystemunitdir=no
-    --with-systemd=no
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd $pkgbase-${_realver}
-
-    ./configure "${_flags[@]}"
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_util-linux() {
-    conflicts=(
-        'rfkill'
-        'hardlink'
-    )
-    provides=(
-        'rfkill'
-        'hardlink'
-    )
-    replaces=(
-        'rfkill'
-        'hardlink'
-    )
-    depends=(
-        'pam'
-        'shadow'
-        'coreutils'
-        'libeudev'
-        'libcap-ng'
-        'libxcrypt'
-        'libcrypt.so'
-        'util-linux-libs'
-        'libmagic.so'
-        'libncursesw.so'
-        'libreadline.so'
-    )
-    optdepends=(
-        'python: python bindings to libmount'
-        'words: default dictionary for look'
-    )
-    backup=(
-        'etc/pam.d/chfn'
-        'etc/pam.d/chsh'
-        'etc/pam.d/login'
-        'etc/pam.d/runuser'
-        'etc/pam.d/runuser-l'
-        'etc/pam.d/su'
-        'etc/pam.d/su-l'
-    )
-
-    cd $pkgbase-${_realver}
-
-    make DESTDIR="$pkgdir" install
-
-    ## setuid chfn and chsh
-    chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
-
-    ## install PAM files for login-utils
-    install -Dm0644 "$srcdir"/pam-common "$pkgdir"/etc/pam.d/chfn
-    install -m 0644 "$srcdir"/pam-common "$pkgdir"/etc/pam.d/chsh
-    install -m 0644 "$srcdir"/pam-login "$pkgdir"/etc/pam.d/login
-    install -m 0644 "$srcdir"/pam-runuser "$pkgdir"/etc/pam.d/runuser
-    install -m 0644 "$srcdir"/pam-runuser "$pkgdir"/etc/pam.d/runuser-l
-    install -m 0644 "$srcdir"/pam-su "$pkgdir"/etc/pam.d/su
-    install -m 0644 "$srcdir"/pam-su "$pkgdir"/etc/pam.d/su-l
-
-    ## adjust for usrmove
-    ## TODO(dreisner): fix configure.ac upstream so that this isn't needed
-    cd "$pkgdir"
-    mv usr/sbin/* usr/bin
-    rmdir usr/sbin
-
-    ### runtime libs are shipped as part of util-linux-libs
-    rm "$pkgdir"/usr/lib/lib*.{a,so}*
-
-    ### install pacopts applysys
-    install -Dm 0644 "$srcdir"/util-linux.sysusers \
-      "$pkgdir"/usr/lib/sysusers.d/util-linux.conf
-
-    install -Dm 0644 "$srcdir"/60-rfkill.rules \
-      "$pkgdir"/usr/lib/udev/rules.d/60-rfkill.rules
-}
-
-package_util-linux-libs() {
-    pkgdesc="util-linux runtime libraries"
-    provides=(
-        'libutil-linux'
-        'libblkid.so'
-        'libfdisk.so'
-        'libmount.so'
-        'libsmartcols.so'
-        'libuuid.so'
-    )
-    conflicts=(
-        'libutil-linux'
-    )
-    replaces=(
-        'libutil-linux'
-    )
-
-    make -C "$pkgbase-${_realver}" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL2)
-
-validpgpkeys=(
-    'B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284' # Karel Zak
-)
-
-sha512sums=('')