diff --git a/Containerfile b/Containerfile
index 383c31f4..683adedd 100644
--- a/Containerfile
+++ b/Containerfile
@@ -211,9 +211,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
     curl -Lo /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo https://copr.fedorainfracloud.org/coprs/hikariknight/looking-glass-kvmfr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/hikariknight-looking-glass-kvmfr-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     curl -Lo /etc/yum.repos.d/_copr_mavit-discover-overlay.repo https://copr.fedorainfracloud.org/coprs/mavit/discover-overlay/repo/fedora-"${FEDORA_MAJOR_VERSION}"/mavit-discover-overlay-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     curl -Lo /etc/yum.repos.d/_copr_matte-schwartz-sunshine.repo https://copr.fedorainfracloud.org/coprs/matte-schwartz/sunshine/repo/fedora-"${FEDORA_MAJOR_VERSION}"/matte-schwartz-sunshine-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
-    curl -Lo /etc/yum.repos.d/_copr_rok-cdemu.repo https://copr.fedorainfracloud.org/coprs/rok/cdemu/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rok-cdemu-fedora-"${FEDORA_MAJOR_VERSION}".rep && \
-    curl -Lo /etc/yum.repos.d/_copr_rodoma92-kde-cdemu-manager.repo https://copr.fedorainfracloud.org/coprs/rodoma92/kde-cdemu-manager/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-kde-cdemu-manager-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
-    curl -Lo /etc/yum.repos.d/_copr_rodoma92-rmlint.repo https://copr.fedorainfracloud.org/coprs/rodoma92/rmlint/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-rmlint-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     curl -Lo /etc/yum.repos.d/tailscale.repo https://pkgs.tailscale.com/stable/fedora/tailscale.repo && \
     rpm-ostree install \
         https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
@@ -297,7 +294,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
         /tmp/akmods-extra-rpms/kmods/*gcadapter_oc*.rpm \
         /tmp/akmods-extra-rpms/kmods/*nct6687*.rpm \
         /tmp/akmods-extra-rpms/kmods/*zenergy*.rpm \
-        /tmp/akmods-extra-rpms/kmods/*vhba*.rpm \
         /tmp/akmods-extra-rpms/kmods/*ayaneo-platform*.rpm \
         /tmp/akmods-extra-rpms/kmods/*ayn-platform*.rpm \
         /tmp/akmods-extra-rpms/kmods/*bmi260*.rpm \
@@ -673,9 +669,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     echo "import \"/usr/share/ublue-os/just/80-bazzite.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/81-bazzite-fixes.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-apps.just\"" >> /usr/share/ublue-os/justfile && \
-    echo "import \"/usr/share/ublue-os/just/82-bazzite-cdemu.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-sunshine.just\"" >> /usr/share/ublue-os/justfile && \
-    echo "import \"/usr/share/ublue-os/just/82-bazzite-rmlint.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-waydroid.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/83-bazzite-audio.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/84-bazzite-virt.just\"" >> /usr/share/ublue-os/justfile && \
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-cdemu.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-cdemu.just
deleted file mode 100644
index f68eb28d..00000000
--- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-cdemu.just
+++ /dev/null
@@ -1,89 +0,0 @@
-# vim: set ft=make :
-
-# Setup and configure CDEmu Daemon and Client plus GUI Apps
-setup-cdemu ACTION="":
-    #!/usr/bin/bash
-    source /usr/lib/ujust/ujust.sh
-    CDEMU_STATE="$(rpm -qa cdemu-daemon)"
-    GUI_EDITION="$(cat /etc/os-release | grep VARIANT_ID | sed 's/^.*=//')"
-    OPTION={{ ACTION }}
-    if [ "$CDEMU_STATE" == "" ]; then
-        CDEMU_STATE="${red}${b}Not Installed${n}"
-        CDEMU_STATE_FLAG="0"
-    else
-        CDEMU_STATE="${green}${b}Installed${n}"
-        CDEMU_STATE_FLAG="1"
-    fi
-    if [ "$OPTION" == "help" ]; then
-      echo "Usage: ujust setup-cdemu <option>"
-      echo "  <option>: Specify the quick option to skip the prompt"
-      echo "  Use 'install' to select Install CDEmu"
-      echo "  Use 'remove' to select Remove CDEmu"
-      echo "  Use 'remove-gui-helper' if you don't want to have the GUI"
-      exit 0
-    elif [ "$OPTION" == "" ]; then
-      echo "${bold}CDEmu setup and configuration${normal}"
-      echo "CDEmu is $CDEMU_STATE"
-      OPTION=$(Choose "Install CDEmu" "Remove CDEmu" "Remove GUI Helper")
-    fi
-    if [[ "${OPTION,,}" =~ ^install ]]; then
-      if [[ "$CDEMU_STATE_FLAG" == "1" ]]; then
-        echo "${red} CDEmu has already been installed!"
-        exit 0
-      fi
-      ublue-update --wait
-      if [[ "$GUI_EDITION" == "kinoite" ]]; then
-            # Install packages for KDE 6
-            rpm-ostree install --apply-live -y cdemu-daemon cdemu-client kde-cdemu-manager-kf6
-      else
-            # Install packages for GNOME
-            rpm-ostree install --apply-live -y cdemu-daemon cdemu-client gcdemu
-      fi
-      # Kickstart the service manually on first install, it doesn't seem to be doing that by default.
-      systemctl start --user cdemu-daemon.service
-      echo "CDEmu is installed!"
-    elif [[ "${OPTION,,}" =~ ^(remove|uninstall) ]]; then
-      if [[ "$CDEMU_STATE_FLAG" == "0" ]]; then
-        echo "${red} CDEmu has already been removed!"
-        exit 0
-      fi
-      ublue-update --wait
-      if [[ "$GUI_EDITION" == "kinoite" ]]; then
-        # Remove packages for KDE 6
-        GUI_STATE="$(rpm -qa kde-cdemu-manager-kf6)"
-        #GUI already removed
-        if [[GUI_STATE == ""]]; then
-          rpm-ostree remove -y cdemu-daemon cdemu-client
-        else
-          rpm-ostree remove -y cdemu-daemon cdemu-client kde-cdemu-manager-kf6
-        fi
-      else
-        # Remove packages for GNOME
-        GUI_STATE="$(rpm -qa gcdemu)"
-        #GUI already removed
-        if [["${GUI_STATE,,}" == ""]]; then
-          rpm-ostree remove -y cdemu-daemon cdemu-client
-        else
-          rpm-ostree remove -y cdemu-daemon cdemu-client gcdemu
-        fi
-      fi
-      echo "CDEmu has been uninstalled."
-    elif [[ "${OPTION,,}" =~ helper ]]; then
-      if [[ "$GUI_EDITION" == "kinoite" ]]; then
-        GUI_STATE="$(rpm -qa kde-cdemu-manager-kf6)"
-        if [["$GUI_STATE" == ""]]; then
-          echo "GUI has already been removed or the package is not yet installed!"
-        else
-          rpm-ostree remove -y kde-cdemu-manager-kf6
-          echo "GUI has been removed, you can still mount images using the CLI with the cdemu command."
-        fi
-      else
-        GUI_STATE="$(rpm -qa gcdemu)"
-        if [["$GUI_STATE" == ""]]; then
-          echo "GUI has already been removed or the package is not yet installed!"
-        else
-          rpm-ostree remove -y gcdemu
-          echo "GUI has been removed, you can still mount images using the CLI with the cdemu command."
-        fi
-      fi
-    fi
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-rmlint.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-rmlint.just
deleted file mode 100644
index fd04c372..00000000
--- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-rmlint.just
+++ /dev/null
@@ -1,43 +0,0 @@
-# vim: set ft=make :
-
-# Reenable rmlint trim feature
-enable-rmlint ACTION="":
-    #!/usr/bin/bash
-    source /usr/lib/ujust/ujust.sh
-    OPTION={{ ACTION }}
-    STATUS="$(cat /etc/conf.d/btrfs-dedup | grep RMLINT_SKIP=\"1\")"
-    if [[ $STATUS != "" ]]; then
-        RMLINT_STATE="${red}${b}not enabled${n}"
-    else
-        RMLINT_STATE="${green}${b}already enabled${n}"
-    fi
-    if [ "$OPTION" == "help" ]; then
-      echo "Usage: ujust enable-rmlint <option>"
-      echo "  <option>: Specify the quick option to skip the prompt"
-      echo "  Use 'enable' to reenable rmlint functionality"
-      echo "  Use 'disable' to revert to UBlue stock configuration (only duperemove is executed)"
-      exit 0
-    elif [ "$OPTION" == "" ]; then
-      echo "${bold}rmlint configuration${normal}"
-      echo "rmlint conf is $RMLINT_STATE"
-      OPTION=$(Choose "Enable rmlint" "Disable rmlint")
-    fi
-    if [[ "${OPTION,,}" =~ ^enable ]]; then
-      if [[ "${RMLINT_STATE,,}" =~ "^already" ]]; then
-        echo "${red} rmlint has already been enabled!"
-        exit 0
-      fi
-      ublue-update --wait
-      rpm-ostree install --apply-live -y rmlint
-      sudo sed -i 's@RMLINT_SKIP="1"@RMLINT_SKIP="0"@g' /etc/conf.d/btrfs-dedup
-      echo "rmlint has been reenabled!"
-    elif [[ "${OPTION,,}" =~ ^(disable|uninstall) ]]; then
-      if [[ "${RMLINT_STATE,,}" =~ "^not" ]]; then
-        echo "${red} rmlint has already been disabled!"
-        exit 0
-      fi
-      ublue-update --wait
-      rpm-ostree remove -y rmlint
-      sudo sed -i 's@RMLINT_SKIP="0"@RMLINT_SKIP="1"@g' /etc/conf.d/btrfs-dedup
-      echo "rmlint has been disabled."
-    fi
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/rmlint-override.conf b/system_files/desktop/shared/usr/share/ublue-os/just/rmlint-override.conf
deleted file mode 100644
index 98e20183..00000000
--- a/system_files/desktop/shared/usr/share/ublue-os/just/rmlint-override.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-[Unit]
-Description=Btrfs deduplication on %f
-ConditionPathIsMountPoint=%f
-RequiresMountsFor=%f
-
-[Service]
-Type=oneshot
-MemoryHigh=1G
-ExecCondition=sh -c '[ "$(stat -f -c "%%T" "$1")" = btrfs ]' _ %f/
-ExecStartPre=-find %f/ -mindepth 1 -maxdepth 1 -mtime +14 -name .duperemove.hash -exec rm -f '{}' \;
-ExecStartPre=-cp -a %f/.duperemove.hash duperemove.hash
-ExecStartPre=-compsize %f/
-ExecStart=rmlint --hidden --types="duplicates" --config=sh:handler=clone %f/
-ExecStart=sh -c 'exec ./rmlint.sh -d -p -r -k'
-ExecStart=-compsize %f/
-ExecStart=-sh -c "[ $(sqlite3 -readonly duperemove.hash \"SELECT keyval FROM config where keyname='version_major'\") -ge 4 ] || rm -f duperemove.hash"
-ExecStart=duperemove -r -d -h -q --hashfile=duperemove.hash --skip-zeroes --exclude="%f/.duperemove.hash" --exclude="%f/@swapfile/swapfile" %f/
-ExecStartPost=-compsize %f/
-ExecStopPost=-cp -a duperemove.hash %f/.duperemove.hash
-TimeoutStartSec=4h
-RuntimeDirectory=%p/%i
-WorkingDirectory=%t/%p/%i
-Nice=19
-CPUSchedulingPolicy=batch
-IOSchedulingClass=best-effort
-IOSchedulingPriority=7
-OOMScoreAdjust=1000
-CPUWeight=30
-CPUQuota=300%
-IOWeight=30