diff --git a/bin/post-run b/bin/post-run
index 4abc8f2de..52e9f129d 100755
--- a/bin/post-run
+++ b/bin/post-run
@@ -193,7 +193,7 @@ copy_time_files || ps faux --cols 1000 2>/dev/null > $RESULT_ROOT/time-debug ||
 
 copy_results
 
-[ "$kconfig" = "x86_64-rhel-7.6-gcov" -o "$kconfig" = "x86_64-rhel-7.2-gcov" -o "$kconfig" = "x86_64-rhel-7.2-clear-gcov" ] && [ -d /sys/kernel/debug/gcov ] && {
+[ "$kconfig" = "x86_64-rhel-7.6-gcov" -o "$kconfig" = "x86_64-rhel-7.2-gcov" ] && [ -d /sys/kernel/debug/gcov ] && {
 	$LKP_SRC/tools/gather-gcov-test $TMP/gcov-test.tar.gz
 	upload_files $TMP/gcov-test.tar.gz
 }
diff --git a/distro/adaptation-pkg/clear b/distro/adaptation-pkg/clear
deleted file mode 100644
index c21487152..000000000
--- a/distro/adaptation-pkg/clear
+++ /dev/null
@@ -1,111 +0,0 @@
-aim7::
-aim9::
-analyze-suspend::
-blktests::
-blogbench::
-bpf_offload::
-bust-shm-exit::
-cassandra::
-chromeswap::
-cyclictest::
-dbench: tbench
-device-dax: ndctl
-ebizzy::
-filebench::
-fileio::
-fsmark::
-ftq::
-fwq::
-fxmark::
-hackbench::
-hwsim::
-iozone::
-kbuild::
-ku-latency::
-kvm-unit-tests::
-leaking-addresses::
-libhugetlbfs-test::
-lib-micro::
-linkbench::
-linpack::
-lmbench3::
-ltp::
-makepkg::
-mce-log::
-mce-test::
-mcperf::
-mdadm-selftests::
-mongodb::
-ndctl::
-nepim::
-netperf::
-netpipe::
-nvdimm: ndctl
-ocfs2test::
-oltp::
-otc_ddt::
-packetdrill::
-pbzip2::
-perf::
-perf-bench-futex: perf
-perf-c2c: perf
-perf-event-tests::
-perf-mem: perf
-perf-node: perf
-perf-probe: perf
-perf-profile: perf
-perf-record-report: perf
-perf-report-srcline: perf
-perf-sanity-tests: perf
-perf-stat: perf
-pft::
-piglit::
-pixz::
-plzip::
-pmbench::
-pm-qa::
-postmark::
-pxz::
-qperf::
-reaim::
-redis-server::
-rocksdb::
-schbench::
-sockperf::
-stream::
-stress-ng::
-stutter::
-swapin: vm-scalability
-sysbench-cpu::
-sysbench-memory::
-sysbench-mutex::
-sysbench-threads::
-tbench::
-thrulay::
-trace-cmd::
-trinity::
-trinity-static-i386::
-trinity-static-x86_64::
-turbostat::
-unixbench::
-will-it-scale::
-xfstests::
-ycsb::
-avocado::
-daxctl::
-pmu-tools::
-autonuma-benchmark::
-mutilate::
-v4l2::
-igt::
-energy: perf
-tlbflush::
-nvml::
-build-nvml: nvml
-nuttcp::
-adrestia::
-kernel-selftests::
-toplev: pmu-tools
-kvm-kernel-boot-test::
-kernbench::
-rt-app::
diff --git a/distro/adaptation/clear b/distro/adaptation/clear
deleted file mode 100644
index 7fdeed609..000000000
--- a/distro/adaptation/clear
+++ /dev/null
@@ -1,604 +0,0 @@
-acl: os-core-dev
-acpica-tools: sysadmin-basic
-acpidump: sysadmin-basic
-aha:
-alsa-utils: os-utils-gui
-apache2: httpd
-apt-file:
-at: os-cloudguest-azure
-attr: dev-utils
-autoconf: c-basic
-autoconf-archive: c-basic
-automake: c-basic
-autopoint: os-core-dev
-autotools-dev: dev-utils-dev
-bash-completion: os-core
-bc: bc
-bind9:
-binutils: c-basic
-binutils-dev: c-basic
-binutils/stable: c-basic
-bison: c-basic
-blktrace: performance-tools
-boxes:
-bridge-utils: network-basic
-bsdtar: os-core-update
-btrfs-progs: dev-utils-dev
-btrfs-tools:
-build-essential: c-basic
-bzip2: os-core-update
-ca-certificates: dev-utils-dev
-cgroup-bin: os-core-dev
-cgroupfs-mount:
-cgroup-tools:
-cifs-utils: storage-utils
-clang: dev-utils
-clang-3.9: dev-utils
-clang-3.9-dev: dev-utils-dev
-clang-7: dev-utils
-cmake: dev-utils
-cpio: dev-utils
-cpp: dev-utils
-cpp-6: dev-utils
-cpp-7: dev-utils
-cpuid: sysadmin-basic
-crda: dev-utils
-cron:
-curl: os-core-dev
-daemon:
-daemontools:
-dbench:
-debhelper:
-debootstrap:
-dh-autoreconf:
-dh-strip-nondeterminism:
-dmidecode: sysadmin-basic
-dnsutils: network-basic
-docbook-xml: dev-utils
-docbook-xsl: dev-utils
-docker.io: cloud-control
-dos2unix: sysadmin-basic
-dosfstools: storage-utils
-doxygen: os-core-dev
-dpkg-dev:
-dump:
-e2fslibs-dev: os-core-dev
-e2fsprogs: os-installer
-ebtables: network-basic
-elfutils: os-core-dev
-ethtool: network-basic
-expect: os-core-dev
-f2fs-tools: os-testsuite-0day
-fakeroot: os-testsuite-0day
-file: os-core-dev
-fio: fio
-flex: c-basic
-fontconfig: dev-utils-dev
-fontconfig-config: dev-utils-dev
-fonts-dejavu-core:
-freeglut3: qt-basic-dev
-freeipmi-bmc-watchdog: sysadmin-hostmgmt
-freeipmi-tools: sysadmin-hostmgmt
-fsmark:
-ftp: network-basic
-fuse: storage-utils-dev
-g++-6: c-basic
-g++: c-basic
-gawk: os-core
-gcc-6: c-basic
-gcc-6-multilib: dev-utils-dev
-gcc-7: c-extras-gcc7
-gcc: c-basic
-gcc-multilib: dev-utils-dev
-gdb: gdb
-gengetopt:
-genisoimage:
-gettext: os-core-dev
-gettext-base: os-core-dev
-gfortran: os-core-dev
-git: git
-glibc-doc:
-gnu-efi: os-core-dev
-gnupg: desktop-apps
-gperf: os-core-dev
-graphviz: os-core-dev
-grml-debootstrap:
-groff-base: dev-utils
-gzip: os-core-update
-hdparm: sysadmin-basic
-heirloom-mailx: mail-utils
-help2man: dev-utils-dev
-hpcc:
-hwinfo:
-i2c-tools: os-testsuite-0day
-iasl: os-testsuite-0day
-indent: c-basic
-info2man:
-initramfs-tools: sysadmin-basic
-initramfs-tools-core:i386: sysadmin-basic
-inotify-tools: inotify-tools
-install-info: texinfo
-intltool-debian: os-testsuite-0day
-inxi:
-iperf: sysadmin-basic
-iperf3: sysadmin-basic
-ipmitool: sysadmin-basic
-iproute2: network-basic
-iw: network-basic
-jfsutils:
-jq: jq
-kexec-tools: os-cloudguest-azure
-klibc-utils:
-klibc-utils:i386:
-kmod: os-core
-less: os-core
-lftp:
-libmariadbclient18:
-libarchive-dev: os-core-update-dev
-libacl1-dev: os-core
-libaio1: os-core-dev
-libaio-dev: storage-utils-dev
-libann0:
-libapache2-mpm-itk:
-libarchive-dev: os-core-update-dev
-libarchive-zip-perl:
-libasan2: os-core-dev
-libasan3: os-core-dev
-libasound2: storage-utils-dev
-libasound2-data: storage-utils-dev
-libasound2-dev: storage-utils-dev
-libatomic1: os-core-dev
-libattr1: os-core-dev
-libattr1-dev: os-core-dev
-libaudit-dev: dev-utils-dev
-libaudit: dev-utils-dev
-libbabeltrace-dev:
-libgtk2.0-dev:
-libperl-dev: perl-basic-dev
-libslang2-dev:
-libblas3: big-data-basic
-libblkid-dev: os-core-dev
-libboost-filesystem-dev:
-libbz2-dev: os-core-dev
-libbz2-1.0:
-libc6: dev-utils-dev
-libc6-dbg:
-libc6-dev: dev-utils-dev
-libc6-dev:i386: dev-utils-dev
-libc6-dev-i386/unstable: dev-utils-dev
-libc6-dev/unstable: dev-utils-dev
-libc6-dev-x32: dev-utils-dev
-libc6-dev-x32/unstable: dev-utils-dev
-libc6-i386: dev-utils-dev
-libc6/unstable: dev-utils-dev
-libcairo2:dev-utils-dev
-libcairo2-dev: dev-utils-dev
-libcap2: dev-utils-dev
-libcap2-bin: sysadmin-basic
-libcap-dev: dev-utils-dev
-libcap-ng-dev: dev-utils-dev
-libc-bin: dev-utils-dev
-libc-bin/unstable: dev-utils-dev
-libcc1-0: os-core-dev
-libc-dev-bin: dev-utils-dev
-libcdt5: os-core-dev
-libcgraph6: os-core-dev
-libcilkrts5:
-libcilkrts5/unstable:
-libc-l10n: os-core-dev
-libclang1-3.9: dev-utils-dev
-libclang-dev: dev-utils-dev
-libconfig-dev: devpkg-libconfig
-libcroco3: os-core-dev
-libdatrie1: storage-utils-dev
-libdbd-mysql-perl:
-libdbi-perl: perl-basic
-libdbus-1-dev: os-core
-libdpkg-perl:
-libdrm-amdgpu1:
-libdrm-dev: libva-utils
-libdrm-dev/unstable: libva-utils
-libdw-dev: dev-utils-dev
-libedit-dev:
-libegl1-mesa-dev: dev-utils-dev
-libelf1: dev-utils-dev
-libelf-dev: dev-utils-dev
-libevent-2.0-5: tmux
-libevent-2.1-6: tmux
-libevent-dev: dev-utils-dev
-libexpat1-dev:
-libfabric1:
-libfabric-dev:
-libfdt1: dtc
-libfdt-dev: dtc
-libffi-dev: dev-utils-dev
-libfftw3-bin: qt-basic-dev
-libfftw3-dev: qt-basic-dev
-libfftw3-double3: qt-basic-dev
-libfftw3-long3: qt-basic-dev
-libfftw3-quad3: qt-basic-dev
-libfftw3-single3: qt-basic-dev
-libfile-stripnondeterminism-perl: perl-extras
-libfontconfig1: dev-utils-dev
-libfreetype6: dev-utils-dev
-libfuse-dev: storage-utils-dev
-libgbm-dev: dev-utils-dev
-libgcc1:
-libgcc-dev: dev-utils-dev
-libgcc-7-dev: dev-utils-dev
-libgcc-7-dev/unstable: dev-utils-dev
-libgd3: stream-server
-libgdbm3: sysadmin-basic-dev
-libgdbm-dev: sysadmin-basic-dev
-libgflags2v5:
-libgflags-dev:
-libgl1-mesa-dev: dev-utils-dev
-libgles2-mesa: dev-utils-dev
-libglib2.0-0: os-core-dev
-libglib2.0-dev: os-core-dev
-libglu-dev: qt-basic-dev
-libgmp-dev: os-core-dev
-libgomp1: os-core-dev
-libgpm2: os-core-dev
-libgpm-dev: os-core-dev
-libgraphite2-3: os-testsuite-0day
-libgts-0.7-5:
-libgvc6: os-core-dev
-libgvpr2: os-core-dev
-libharfbuzz0b: dev-utils-dev
-libhugetlbfs:
-libhugetlbfs-bin:
-libhugetlbfs-dev:
-libhwloc-dev: dev-utils-dev
-libiberty-dev: c-basic-legacy
-libibverbs1: storage-utils
-libibverbs-dev: storage-utils-dev
-libice6: os-core-dev
-libicu: dev-utils-dev
-libipa-hbac0:
-libisl15:
-libitm1: os-core-dev
-libjbig0:
-libjpeg62-turbo: dev-utils-dev
-libjpeg-dev: dev-utils-dev
-libjson-c-dev: os-core-dev
-libklibc-dev: dev-utils-dev
-libkmod2: os-core-dev
-libkmod-dev: os-core-dev
-libkeyutils1: os-core-dev
-libkeyutils-dev: os-core-dev
-libldb1: storage-utils
-libllvm3.9: os-testsuite-0day
-liblsan0: os-core-dev
-liblsan0/unstable: os-core-dev
-libltdl7: os-core-dev
-liblzma-dev: dev-utils-dev
-liblz4-1:
-liblz4-dev:
-libmagic1: os-core-dev
-libmagic-mgc: os-core-dev
-libmariadbclient-dev: os-testsuite-0day
-libmodule-build-perl:
-libmount-dev: os-core-dev
-libmpc3: os-core-dev
-libmpfr6:
-libmpx2: dev-utils-dev
-libmpx2/unstable: dev-utils-dev
-libncurses5-dev: os-core-dev
-libncursesw5-dev: os-core-dev
-libnl-3-dev: storage-utils
-libnl-genl-3-dev: storage-utils
-libnl-route-3-dev: network-basic-dev
-libnpth0: storage-utils-dev
-libnpth0-dev: storage-utils-dev
-libnss-sss: os-core-dev
-libnuma1: dev-utils-dev
-libnuma-dev: dev-utils-dev
-libobjc-7-dev/unstable:
-liboop4:
-liboop-dev:
-libopencryptoki0:
-libopenmpi2: dev-utils-dev
-libopenmpi-dev: dev-utils-dev
-libpango-1.0-0: storage-utils-dev
-libpangocairo-1.0-0: storage-utils-dev
-libpangoft2-1.0-0: storage-utils-dev
-libpathplan4: os-core-dev
-libpcap0.8-dev: network-basic-dev
-libpcap-dev: network-basic-dev
-libpci3: sysadmin-basic
-libpciaccess-dev: dev-utils-dev
-libpci-dev: sysadmin-basic-dev
-libperl5: perl-basic
-libipc-run-perl: perl-extras
-libpipeline1: dev-utils-dev
-libpixman-1-0: dev-utils-dev
-libpixman-1-dev: dev-utils-dev
-libpng16-16: dev-utils-dev
-libpng-dev: dev-utils-dev
-libpopt0: dev-utils
-libpopt-dev: dev-utils
-libprocps-dev: os-core-dev
-libprotobuf-dev: network-basic-dev
-libquadmath0: os-core-dev
-libquadmath0/unstable: os-core-dev
-librdmacm1: network-basic
-librdmacm-dev: network-basic-dev
-libreadline5: os-core
-libreadline-dev: os-core-dev
-libsamplerate0: qt-basic-dev
-libsamplerate0-dev: qt-basic-dev
-libsctp1: dev-utils-dev
-libsctp-dev: dev-utils-dev
-libsdl1.2debian: stream-server
-libselinux1:
-libsm6: os-core-dev
-libsmbclient: os-core-dev
-libsnappy1v5:
-libsnappy-dev:
-libsqlite3-dev: linux-tools
-libssl-dev: os-core
-libssl: os-core
-libssl-dev: os-core-update
-libsss-idmap0:
-libsss-simpleifp0:
-libstdc++-6-dev: os-core-dev
-libstdc++6/unstable: os-core
-libstdc++-7-dev/unstable: os-core-dev
-libthai0: storage-utils-dev
-libthai-data: weston-extras
-libtiff5: storage-utils-dev
-libtimedate-perl: perl-extras
-libtinfo-dev: os-core-dev
-libtirpc: storage-utils-dev
-libtirpc-dev: storage-utils-dev
-libtool: dev-utils-dev
-libtool-bin: os-core-dev
-libtsan0: os-core-dev
-libtsan0/unstable: os-core-dev
-libubsan0: os-core-dev
-libubsan0/unstable: os-core-dev
-libudev1: os-core-dev
-libudev-dev: os-core-dev
-libunistring0: os-core-dev
-libunwind8: os-core-dev
-libunwind-dev: dev-utils-dev
-libuuid1: os-core-dev
-libuv1-dev:
-libwaffle-dev:
-libwbclient0: storage-utils-dev
-libwebp6: network-basic-dev
-libx11-6: os-core-dev
-libx11-data: os-core-dev
-libx11-dev: os-core-dev
-libx11-xcb-dev: os-core-dev
-libxau6: libX11client
-libxaw7: os-testsuite-0day
-libxcb1: os-core-dev
-libxcb-render0: os-core-dev
-libxcb-shm0: os-core-dev
-libxdmcp6: os-core-dev
-libxdot4: os-core-dev
-libxext6: os-core-dev
-libxkbcommon-dev: qt-basic-dev
-libxml2: dev-utils
-libxml2-dev: dev-utils-dev
-libxml2-utils: dev-utils
-libxmu6: gimp
-libxpm4: texlive
-libxrender1: dev-utils-dev
-libxslt1.1: dev-utils-dev
-libxt6: gimp
-libzmq3-dev:
-libzmq5: software-testing
-libzstd-dev:
-linux-base: linux-tools
-linux-libc-dev: dev-utils-dev
-linux-libc-dev:i386: dev-utils-dev
-linux-libc-dev/unstable: dev-utils-dev
-linux-perf: linux-tools
-lksctp-tools:
-llvm-3.9: dev-utils
-llvm-3.9-dev: dev-utils-dev
-llvm-7: dev-utils
-llvm-dev: dev-utils-dev
-locales: sysadmin-basic
-lockfile-progs:
-lsof: sysadmin-basic
-lsscsi:
-lvm2: storage-utils
-lxc:
-m4: os-core-dev
-make: c-basic
-man: sysadmin-basic
-man-db: sysadmin-basic
-manpages-dev: sysadmin-basic
-maven: dev-utils-dev
-mcelog: kernel-lts
-mdadm: storage-utils
-memcached: os-testsuite-0day
-minicom: sysadmin-basic
-moreutils: os-testsuite-0day
-msr-tools: performance-tools
-mutt: mail-utils
-mysql-server: mariadb
-nasm: qt-basic-dev
-nbd-client:
-nbd-server:
-ncurses-bin: sysadmin-basic
-needrestart:
-netcat-openbsd: network-basic
-netpipe-lam:
-netpipe-mpich2:
-netpipe-openmpi:
-netpipe-pvm:
-netpipe-tcp:
-net-tools: network-basic
-nfs-common: storage-utils
-nfs-kernel-server: storage-utils
-nilfs-tools:
-nscd:
-ntpdate:
-numactl: sysadmin-basic
-nvme-cli: storage-utils
-ocfs2-tools:
-ocfs2-tools-dev:
-openbsd-inetd:
-opencryptoki:
-openjdk: java-runtime
-openmpi-bin: dev-utils-dev
-openssl: openssl
-pandoc: os-testsuite-0day
-parallel: sysadmin-basic
-parted: storage-utils
-patch: patch
-pbzip2: os-testsuite-phoronix
-pciutils: sysadmin-basic
-perl: perl-basic
-perl-base: perl-basic
-perl-modules-5: perl-basic
-phoronix-test-suite: os-testsuite-phoronix
-php-cli: php-basic
-php-xml: php-basic
-pigz: sysadmin-basic
-pixz:
-pkg-config: c-basic
-plzip:
-po-debconf:
-postfix:
-postgresql: database-basic
-postgresql-contrib: database-basic
-postmark: mail-utils
-procps: os-core
-protobuf-compiler: sysadmin-basic-dev
-psmisc: os-core
-pulseaudio: qt-basic-dev
-pxz:
-python: python-basic
-python2.7: python2-basic
-python3: python3-basic
-python3-colorama: python-extras
-python3-mako: python-extras
-python3-markupsafe: python-extras
-python3-numpy: python-extras
-python3-six: python-extras
-python-configparser: python-basic-dev
-python-crypto: python-basic-dev
-python-csvkit:
-python-dbus: python2-basic
-python-dev: python-basic-dev
-python-gobject: python2-basic
-python-minimal: python-basic
-python-netifaces:
-python-numpy: python2-basic
-python-openssl: python2-basic
-python-pip: python2-basic
-python-pkg-resources:
-python-pyrad:
-python-setuptools: python2-basic
-python-simplejson: python-extras
-python-six: python2-basic
-python-sss:
-python-wheel: python2-basic
-qemu: kvm-host
-qemu-system-x86: kvm-host
-qemu-utils: kvm-host
-quota:
-reiserfsprogs:
-rpcbind:storage-utils
-rstatd:
-rsync: dev-utils
-rsyslog:
-rt-tests: performance-tools
-ruby2.3-dev: ruby-basic
-ruby-bunny: os-testsuite-0day
-ruby-colorize: os-testsuite-0day
-ruby-dev: ruby-basic
-ruby-facets: os-testsuite-0day
-ruby-git: os-testsuite-0day
-ruby-gnuplot: os-testsuite-0day
-ruby-mail: os-testsuite-0day
-ruby: ruby-basic
-ruby-serialport: os-testsuite-0day
-ruby-sinatra: os-testsuite-0day
-ruby-term-ansicolor: os-testsuite-0day
-ruby-text-table: os-testsuite-0day
-runc: cloud-control
-runit:
-rusers:
-rusersd:
-samba-libs: storage-utils
-scons: qt-basic-dev
-screen: sysadmin-basic
-sed: os-core
-sg3-utils: os-testsuite-0day
-sgml-base:
-sgml-data:
-siege: performance-tools
-socat: sysadmin-basic
-ssh: openssh-server
-sssd:
-sssd-ad:
-sssd-ad-common:
-sssd-common:
-sssd-dbus:
-sssd-ipa:
-sssd-krb5:
-sssd-krb5-common:
-sssd-ldap:
-sssd-proxy:
-sssd-tools:
-strace: sysadmin-basic
-stress-ng: dev-utils
-sudo: sudo
-sysbench:
-sysstat: sysstat
-systemd: os-core
-systemtap-sdt-dev:
-tcl: tcl-basic
-tcpdump: network-basic
-texinfo: os-core-dev
-thin-provisioning-tools: storage-utils
-time: sysadmin-basic
-tk: dev-utils-dev
-tpm-tools:
-trousers:
-tshark: wireshark
-udev: os-core
-udhcpc:
-unzip: sysadmin-basic
-update-inetd:
-usbutils: sysadmin-basic
-uuid-dev: os-core-dev
-uuid-runtime: os-core
-vim: vim
-virt-what:
-vsftpd:
-waffle-utils:
-watchdog: sysadmin-hostmgmt
-wget: network-basic
-winpdb:
-wireless-regdb: wpa_supplicant
-wireshark-common: wireshark
-wpasupplicant: wpa_supplicant
-x11-common:
-xfsdump: storage-utils
-xfsprogs: storage-utils
-xinit: xfce4-desktop
-xml-core:
-xmlto: os-core-dev
-xorg: desktop
-xsltproc: dev-utils
-xutils-dev: os-clr-on-clr-dev
-zlib1g: os-core-dev
-zlib1g-dev: os-core-dev
-zsh: zsh
-libapparmor1:
-libapparmor-dev:
-libbsd0:
-libbsd-dev:
-libgcrypt20: devpkg-libgcrypt
-libgcrypt-dev: devpkg-libgcrypt
-libipsec-mb:
-libipsec-mb-dev:
-pax:
diff --git a/distro/clear b/distro/clear
deleted file mode 100755
index f21de89c3..000000000
--- a/distro/clear
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/bin/bash
-
-shopt -s nullglob
-
-. $LKP_SRC/lib/install.sh
-. $LKP_SRC/distro/common
-. $LKP_SRC/lib/debug.sh
-
-distro_install_depends()
-{
-	local script
-	local bm="$1"
-	local scripts=$(find $LKP_SRC/distro/depends/ -name "$bm" -o -name "${bm}.[0-9]")
-
-	for script in $scripts
-	do
-		script=$(basename $script)
-		packages=$(get_dependency_packages $DISTRO $script)
-
-		[ -z "$packages" ] && continue
-
-		echo install packages for $script: $packages
-
-		$LKP_SRC/distro/installer/clear $packages
-	done
-}
-
-pack_benchmark()
-{
-	distro_install_depends lkp-dev
-
-	for BM_NAME in $benchmark
-	do
-		distro_install_depends $BM_NAME-dev || continue
-		echo $LKP_SRC/sbin/pack -d $DISTRO -f -c -s $PKG_MNT/$pack_to $BM_NAME
-		(
-			setup_proxy
-			$LKP_SRC/sbin/pack -d $DISTRO -f -c -s $PKG_MNT/$pack_to $BM_NAME
-		)
-	done
-}
-
-install_runtime_depends()
-{
-	local scripts=
-	local job=$1
-
-	parse_yaml $job
-	distro_install_depends lkp
-
-	for script in $scripts
-	do
-		distro_install_depends $script
-	done
-}
-
-fixup_preinstall()
-{
-	:
-}
-
-resolve_uninstalled_bundles()
-{
-	for b in $1
-	do
-		[ "$b" = "os-core" ] && continue
-		[ -f $tmpdir/Manifest.$b ] && continue
-		cp -a $(ls -t /var/lib/swupd/*/Manifest.$b | head -1) $tmpdir/
-
-		uninstalled_atomic_bundles="$uninstalled_atomic_bundles $b"
-
-		# some bundles include other bundles
-		include_bundles=$(cat $tmpdir/Manifest.$b | grep ^includes: | awk -F'^includes:' '{print $2}')
-		resolve_uninstalled_bundles "$include_bundles"
-	done
-}
-
-# delta = to_pack - installed
-delta_bundles()
-{
-	local installed_bundles=$1
-	local to_pack=$2
-	local delta=
-
-	for i in $to_pack
-	do
-		grep -qw "^$i$" $installed_bundles || delta="$delta $i"
-	done
-
-	echo $delta
-}
-
-# if /usr/share/clear/bundles/xxx is removed,
-# swupd bundle-list cannot detect this bundle
-fixup_benchmark()
-{
-	[ "$BM_NAME" = "pack-deps" ] || return
-	for d in $delta
-	do
-		rm -rf /usr/share/clear/bundles/$d
-	done
-}
-
-list_bundles_files()
-{
-	local delta=$(delta_bundles $installed_bundles_file "$uninstalled_atomic_bundles")
-
-	echo "Actually pack bundles: $delta"
-	echo "$delta" >$pack_to/.${BM_NAME}.bundles
-
-	fixup_benchmark
-
-	for d in $delta
-	do
-		while read a b c f
-		do
-			[ -n "$f" ] && [ -e "$f" ] && echo "$f" >>$tmpdir/$d.list
-		done <$tmpdir/Manifest.$d
-	done
-}
-
-pack_bundles_files()
-{
-	local date=$(date +"%Y%m%d")
-	# allow empty
-	ls $tmpdir | grep -q "\.list$" >/dev/null || {
-		echo "empty PACKAGE_LIST for $BM_NAME"
-		return 0
-	}
-
-	cat $tmpdir/*.list | sort | uniq |
-		cpio --quiet -o -H newc --owner=root.root |
-		gzip -n -9 >$pack_to/${BM_NAME}_$date.cgz || return
-
-	ln -sf ${BM_NAME}_$date.cgz $pack_to/${BM_NAME}.cgz || return
-	chown .lkp $pack_to/${BM_NAME}_$date.cgz $pack_to/${BM_NAME}.cgz || return
-
-	echo package installed to $pack_to/${BM_NAME}.cgz
-}
-
-# 1. install all un-installed bundles and record it to uninstalled_bundles
-# 2. list atomic bundles by searching uninstalled_bundles recursively
-# 3. list files for each atomic bundle and pack it
-pack_benchmark_deps()
-{
-	local installed_bundles_file=$(mktemp /tmp/pack-deps-installed-bundles-XXXXXXXX)
-	local uninstalled_bundles=
-	local uninstalled_atomic_bundles=
-
-	swupd bundle-list >$installed_bundles_file
-
-	for BM_NAME in $benchmark
-	do
-		local tmpdir=$(mktemp -d /tmp/pack-deps-$BM_NAME-XXXXXXXX)
-
-		check_shared_package $BM_NAME
-		packages=$(echo $(get_dependency_packages $DISTRO $BM_NAME))
-		for p in $packages
-		do
-			swupd bundle-list | grep -qw "^$p$" && continue
-			swupd bundle-list -a | grep -qw "^$p$" || return
-			$LKP_SRC/distro/installer/clear $p 2>&1 | grep -v "Out of memory"
-
-			uninstalled_bundles="$uninstalled_bundles $p"
-		done
-
-		echo "uninstalled bundles: $uninstalled_bundles"
-		resolve_uninstalled_bundles "$uninstalled_bundles"
-
-		echo "uninstalled_atomic_bundles: $uninstalled_atomic_bundles"
-		list_bundles_files
-
-		pack_bundles_files || return
-	done
-}
diff --git a/distro/installer/clear b/distro/installer/clear
deleted file mode 100755
index d3de6cd4c..000000000
--- a/distro/installer/clear
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-for i in $*
-do
-	swupd bundle-list | grep -qw "^$i$" || swupd bundle-add --skip-diskspace-check $i
-done
diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh
index d3751bda6..1bcb10d8d 100755
--- a/lib/bootstrap.sh
+++ b/lib/bootstrap.sh
@@ -94,13 +94,6 @@ network_ok()
 		[ "$(cat $i/carrier 2>/dev/null)" = '1' ]	&& return 0
 	done
 
-	is_clearlinux && {
-		net_devices_link up
-
-		# in case of systemd-networkd.service was masked
-		systemctl unmask systemd-networkd.service
-		systemctl start systemd-networkd.service
-	}
 	return 1
 }
 
@@ -221,20 +214,10 @@ add_lkp_user()
 	fi
 }
 
-clearlinux_timesync()
-{
-	echo "[Time]" >/etc/systemd/timesyncd.conf
-	echo "NTP=internal-lkp-server" >>/etc/systemd/timesyncd.conf
-	timedatectl set-ntp false
-	timedatectl set-ntp true
-	hwclock -w
-}
-
 run_ntpdate()
 {
 	[ -z "$NO_NETWORK" ] || return
 	[ "$LKP_SERVER" = inn ] || return
-	is_clearlinux && clearlinux_timesync && return
 
 	[ -x '/usr/sbin/ntpdate' ] || return
 
@@ -721,7 +704,7 @@ boot_init()
 
 	mount_debugfs
 
-	if is_clearlinux || is_aliyunos; then
+	if is_aliyunos; then
 		add_nfs_default_options
 	fi
 
diff --git a/lib/env.sh b/lib/env.sh
index 00be4ce52..0a0fe9931 100755
--- a/lib/env.sh
+++ b/lib/env.sh
@@ -92,11 +92,6 @@ disable_nmi_watchdog()
 	echo 0 > /proc/sys/kernel/nmi_watchdog
 }
 
-is_clearlinux()
-{
-	[ -f /usr/lib/os-release ] && grep -qw "Clear Linux" /usr/lib/os-release
-}
-
 need_run_on_vmm()
 {
 	# lkp qemu will set LKP_LOCAL_RUN=1
diff --git a/lib/tests/phoronix-test-suite.sh b/lib/tests/phoronix-test-suite.sh
index b57e268b3..67f72c2e6 100644
--- a/lib/tests/phoronix-test-suite.sh
+++ b/lib/tests/phoronix-test-suite.sh
@@ -182,7 +182,6 @@ fixup_mysqlslap()
 	[ -n "$environment_directory" ] || return
 	local test=$1
 	local target=$environment_directory/../test-profiles/pts/${test}/pre.sh
-	is_clearlinux && sed -i 's,mysqld_safe --no-defaults,mysqld --user root --log-error=/tmp/log,' "$target"
 	sed -i '4a groupadd mysql' "$target"
 	sed -i '5a useradd -g mysql mysql' "$target"
 	sed -i '6a chown -R mysql:mysql data' "$target"
@@ -267,7 +266,7 @@ fixup_fio()
 	modprobe loop || return
 	mount -t auto -o loop $test_disk $test_dir ||return
 
-	is_clearlinux || sed -i 's,#!/bin/sh,#!/bin/dash,' "$target"
+	sed -i 's,#!/bin/sh,#!/bin/dash,' "$target"
 	sed -i "s#filename=\$DIRECTORY_TO_TEST#filename=$test_dir/fiofile#" "$target"
 
 	# Choose
@@ -358,11 +357,8 @@ fixup_network_loopback()
 	[ -n "$environment_directory" ] || return
 	local test=$1
 	local target=${environment_directory}/pts/${test}/network-loopback
-	if is_clearlinux; then
-		sed -i 's,nc -d -l,nc -l,' $target
-	else
-		sed -i 's,nc -d -l,nc -l -p,' $target
-	fi
+
+	sed -i 's,nc -d -l,nc -l -p,' $target
 }
 
 fixup_mcperf()
@@ -527,7 +523,7 @@ fixup_install()
 		;;
 	clpeak-*)
 		# fix issue: Could not find OpenCL include/libs.  Set OPENCL_ROOT to your OpenCL SDK.
-		is_clearlinux || fixup_clpeak_install $test || die "failed to fixup $test install"
+		fixup_clpeak_install $test || die "failed to fixup $test install"
 		;;
 	numenta-nab-*)
 		# fix issue: No matching distribution found for nupic==1.0.5 (from nab==1.0)
@@ -606,14 +602,6 @@ run_test()
 			# 3: Test All Options
 			test_opt="\n3\n2\n3\nn"
 			;;
-		pymongo-inserts-*)
-			# no needed package(mongodb) on clear
-			ignored_on_clear=1
-			;;
-		render-bench-*)
-			# no needed package(libimlib2-dev) on clear
-			ignored_on_clear=1
-			;;
 		interbench-*)
 			# produce big file to /opt/rootfs when test on cluster
 			[ "$LKP_LOCAL_RUN" = "1" ] || fixup_interbench $test || die "failed to fixup test $test"
@@ -626,9 +614,7 @@ run_test()
 			# Choose
 			# 2: Flow MPI Norne
 			# 1: 1
-			# no needed packages(tinyxml-dev lapack) on clear
 			test_opt="\n2\n1\nn"
-			ignored_on_clear=1
 			;;
 		numenta-nab-*)
 			# fix issue: SyntaxError: Missing parentheses in call to 'print'.
@@ -660,22 +646,17 @@ run_test()
 			# Choose
 			# 1: ONS-Torlan Botmatch
 			# 2: 800 x 600
-			# no needed package(libstdc++5) on clear
 			test_opt="\n6\n1\nn"
 			export DISPLAY=:0
-			ignored_on_clear=1
 			;;
 		x11perf-*)
 			# Choose
 			# 1: 500px PutImage Square
-			# no needed package(libxmuu-dev libxrender-dev libxft-dev) on clear
 			test_opt="\n1\nn"
 			export DISPLAY=:0
-			ignored_on_clear=1
 			;;
 		tesseract-*)
 			export DISPLAY=:0
-			ignored_on_clear=1
 			find_max_resolution $test || die "failed to find max resolution for $test"
 			;;
 		smart-*)
@@ -772,9 +753,7 @@ run_test()
 			fixup_aom_av1 $test || die "failed to fixup test aom-av1"
 			;;
 		bullet-*)
-			is_clearlinux || {
-				fixup_bullet $test || die "failed to fixup test bullet"
-			}
+			fixup_bullet $test || die "failed to fixup test bullet"
 			;;
 		gpu-residency-*)
 			fixup_gpu_residency $test || die "failed to fixup test $test"
@@ -843,15 +822,9 @@ run_test()
 		test_opt=${test_opt}n
 	fi
 
-	is_clearlinux || {
-		root_access="/usr/share/phoronix-test-suite/pts-core/static/root-access.sh"
-		[ -f "$root_access" ] || die "$root_access not exist"
-		sed -i 's,#!/bin/sh,#!/bin/dash,' $root_access
-	}
-
-	if is_clearlinux && [ "$ignored_on_clear" ]; then
-		echo "${test}... ignored_by_lkp" && return
-	fi
+	root_access="/usr/share/phoronix-test-suite/pts-core/static/root-access.sh"
+	[ -f "$root_access" ] || die "$root_access not exist"
+	sed -i 's,#!/bin/sh,#!/bin/dash,' $root_access
 
 	if echo "$test" | grep idle-power-usage; then
 		# Choose
diff --git a/lkp-exec/install b/lkp-exec/install
index 8efd6b2a5..8afa78e97 100755
--- a/lkp-exec/install
+++ b/lkp-exec/install
@@ -326,11 +326,6 @@ do
 		parse_yaml $filename
 	fi
 
-	is_clearlinux && {
-		export PATH=/lkp/benchmarks/makepkg/bin:$PATH
-		scripts="makepkg $scripts"
-	}
-
 	for script in $scripts
 	do
 		[ -L "$LKP_SRC/pack/$script" ] && {
diff --git a/pkg/nvml/PKGBUILD b/pkg/nvml/PKGBUILD
index df4855d36..23f1ed429 100644
--- a/pkg/nvml/PKGBUILD
+++ b/pkg/nvml/PKGBUILD
@@ -91,7 +91,7 @@ build()
 		cd "${srcdir}/nvml"
 		sed -i 's/CXXFLAGS += -Wno-unknown-attributes/CXXFLAGS += -Wno-ignored-attributes/' ./src/benchmarks/Makefile
 	}
-	[ "$DISTRO" = "clear" ] && return
+
 	build_install_valgrind_pmem
 	build_install_libfabric
 	build_install_libcxx
@@ -105,13 +105,12 @@ package()
 	mkdir -p "${benchmark_path}"
 	cp -af "${srcdir}/${pkgname}" "${benchmark_path}"
 	. $LKP_SRC/lib/env.sh
-	is_clearlinux || {
-		cd "${srcdir}/valgrind"
-		make DESTDIR="${pkgdir}" install
-		cd "${srcdir}/libfabric"
-		make DESTDIR="${pkgdir}" install
-		cp -af "/usr/local/libcxx" "${pkgdir}/usr/local"
-		cd "${srcdir}/ndctl"
-		make DESTDIR="${pkgdir}" install
-	}
+
+	cd "${srcdir}/valgrind"
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/libfabric"
+	make DESTDIR="${pkgdir}" install
+	cp -af "/usr/local/libcxx" "${pkgdir}/usr/local"
+	cd "${srcdir}/ndctl"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/pkg/perf/PKGBUILD b/pkg/perf/PKGBUILD
index fadf065d3..333857e5c 100644
--- a/pkg/perf/PKGBUILD
+++ b/pkg/perf/PKGBUILD
@@ -11,7 +11,6 @@ build()
 {
 	cd $srcdir/linux/tools/perf
 
-	[ "$DISTRO" = "clear" ] && ln -sf /usr/bin/ld.gold $BUILD_DIR/ld
 	PATH=$BUILD_DIR:$PATH make
 }
 
diff --git a/pkg/phoronix-test-suite/PKGBUILD b/pkg/phoronix-test-suite/PKGBUILD
index 9e53cce2c..766849077 100644
--- a/pkg/phoronix-test-suite/PKGBUILD
+++ b/pkg/phoronix-test-suite/PKGBUILD
@@ -9,9 +9,6 @@ md5sums=('7dc8f085701122f031516e03c439d347')
 
 package()
 {
-	# clearlinux use bundle to install this benchmark
-	[ "$DISTRO" = "clear" ] && return 0
-
 	cd "${srcdir}/${pkgname}"
 	sh install-sh
 	mkdir -p "${pkgdir}/usr/bin"
diff --git a/pkg/pm-qa/PKGBUILD b/pkg/pm-qa/PKGBUILD
index 739b3c216..7214f89f7 100644
--- a/pkg/pm-qa/PKGBUILD
+++ b/pkg/pm-qa/PKGBUILD
@@ -14,8 +14,6 @@ build()
 	cd utils
 	make
 
-	[ "$DISTRO" = "clear" ] && return
-
 	cd ${srcdir}/glmark2
 	benchmark_path="${pkgdir}/lkp/benchmarks/${pkgname}"
 	mkdir -p $benchmark_path/glmark2
diff --git a/pkg/vmem/PKGBUILD b/pkg/vmem/PKGBUILD
index 4a8bc8a86..fca79f495 100644
--- a/pkg/vmem/PKGBUILD
+++ b/pkg/vmem/PKGBUILD
@@ -91,7 +91,7 @@ build()
 		cd "${srcdir}/nvml"
 		sed -i 's/CXXFLAGS += -Wno-unknown-attributes/CXXFLAGS += -Wno-ignored-attributes/' ./src/benchmarks/Makefile
 	}
-	[ "$DISTRO" = "clear" ] && return
+
 	build_install_valgrind_pmem
 	build_install_ndctl
 	build_install_pmdk
@@ -104,13 +104,12 @@ package()
 	mkdir -p "${benchmark_path}"
 	cp -af "${srcdir}/${pkgname}" "${benchmark_path}"
 	. $LKP_SRC/lib/env.sh
-	is_clearlinux || {
-		cd "${srcdir}/valgrind"
-		make DESTDIR="${pkgdir}" install
-		cp -af "/usr/local/libcxx" "${pkgdir}/usr/local"
-		cd "${srcdir}/ndctl"
-		make DESTDIR="${pkgdir}" install
-		cd "${srcdir}/pmdk"
-		make DESTDIR="${pkgdir}" install
-	}
+
+	cd "${srcdir}/valgrind"
+	make DESTDIR="${pkgdir}" install
+	cp -af "/usr/local/libcxx" "${pkgdir}/usr/local"
+	cd "${srcdir}/ndctl"
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/pmdk"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/setup/pgbench-setup b/setup/pgbench-setup
index cc0ce37da..4c82b05de 100755
--- a/setup/pgbench-setup
+++ b/setup/pgbench-setup
@@ -33,7 +33,6 @@ init_postgresql()
 	chown postgres "$data_dir"
 
 	bin_dir=/usr/lib/postgresql/*/bin
-	is_clearlinux && bin_dir=/usr/bin
 
 	postgres_run $bin_dir/initdb  -D "$data_dir" 2>&1
 	postgresql_conf_file="$data_dir"/postgresql.conf
diff --git a/setup/setup-linkbench b/setup/setup-linkbench
index 756033169..c673fb232 100755
--- a/setup/setup-linkbench
+++ b/setup/setup-linkbench
@@ -25,11 +25,6 @@ setup_java_home
 
 cd "$BENCHMARK_ROOT/linkbench" || exit
 
-is_clearlinux && {
-	/usr/bin/mysqld --user root > /dev/null 2>&1 &
-	sleep 3
-}
-
 cp config/LinkConfigMysql.properties config/MyConfig.properties
 
 mysql << "MY_QUERY"
diff --git a/setup/stop_daemons b/setup/stop_daemons
index a64017875..12c3b75b9 100755
--- a/setup/stop_daemons
+++ b/setup/stop_daemons
@@ -2,8 +2,4 @@
 
 . $LKP_SRC/lib/env.sh
 
-if is_clearlinux; then
-	systemctl stop sshd.service
-else
-	/etc/init.d/ssh stop
-fi
+/etc/init.d/ssh stop
diff --git a/tests/libhugetlbfs-test b/tests/libhugetlbfs-test
index 4701e4760..bba78dbf2 100755
--- a/tests/libhugetlbfs-test
+++ b/tests/libhugetlbfs-test
@@ -7,11 +7,6 @@
 
 cd $BENCHMARK_ROOT/libhugetlbfs-test || die "can not cd libhugetlbfs-test"
 
-is_clearlinux && {
-	make_opt="PREFIX=/usr LIB32=lib32 LIB64=lib64 CFLAGS=-fPIC"
-	sed -i 's#/usr/bin/env python#/usr/bin/env python2#g' tests/run_tests.py
-}
-
 log_cmd make $make_opt || die "make failed"
 
 [ -z $pagesize ] && die "invalid parameter"
diff --git a/tests/makepkg b/tests/makepkg
index 944924a94..bcfe19330 100755
--- a/tests/makepkg
+++ b/tests/makepkg
@@ -22,8 +22,6 @@ export DISTRO=${rootfs%%-*}
 
 cd $LKP_SRC/pkg/$benchmark || die "pkg is empty"
 
-is_clearlinux && ln -sf $BENCHMARK_ROOT/makepkg/bin/fakeroot /usr/bin/fakeroot
-
 pack_to=$(basename $rootfs)
 PKG_MNT=/osimage/pkg
 mkdir -p "$PKG_MNT"
diff --git a/tests/trinity b/tests/trinity
index 8fb69e1ae..d1efd1b0e 100755
--- a/tests/trinity
+++ b/tests/trinity
@@ -34,7 +34,6 @@ has_cmd trinity || {
 
 cd /tmp
 if chroot --help 2>&1 | grep -q -- --userspec; then
-	groupadd nogroup 2>&1 # for clearlinux
 	log_cmd chroot --userspec nobody:nogroup / $cmd 2>&1 &
 else
 	log_cmd $cmd -X 2>&1 &
diff --git a/tests/xfstests b/tests/xfstests
index 10df51b29..bb3ff3555 100755
--- a/tests/xfstests
+++ b/tests/xfstests
@@ -17,20 +17,8 @@ check_add_user()
 {
 	[ "x$1" != "x" ] || return
 	grep -q -w "$1" /etc/passwd && return
-	# 123456-fsgqa is a invalid user name on Clear, useradd doesn't work
-	useradd -m "$1" >/dev/null 2>&1 || {
-		if is_clearlinux; then
-			mkdir /home/$1
-			echo "$1:x:666" >> /etc/group
-			echo "$1:x:666:666::/home/$1:/bin/bash" >> /etc/passwd
-			# avoid error "su: Authentication service cannot retrieve authentication info"
-			echo "$1:!:17884::::::" >> /etc/shadow
-			chown -R $1:$1 /home/$1
-			chmod -R go= /home/$1
-		else
-			echo "$(basename $0): useradd $1 failed" 1>&2
-		fi
-	}
+
+	useradd -m "$1" >/dev/null 2>&1 || echo "$(basename $0): useradd $1 failed" 1>&2
 }
 
 create_virtual_disk()