diff --git a/initial-setup.spec b/initial-setup.spec
index 5281872..9700f5c 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -1,5 +1,4 @@
-# Enable X11 for RHEL 9 and older only
-%bcond x11 %[0%{?rhel} && 0%{?rhel} < 10]
+
 
 Name: initial-setup
 Summary: Initial system configuration utility
@@ -110,28 +109,6 @@ RemovePathPostfixes: .guiweston
 
 # --------------------------------------------------------------------------
 
-%if %{with x11}
-%package gui-xorg
-Summary: Run the initial-setup GUI in Xorg
-Requires: %{name}-gui = %{version}-%{release}
-Requires: xorg-x11-xinit
-Requires: xorg-x11-server-Xorg
-Requires: firstboot(windowmanager)
-
-Provides:  firstboot(gui-backend)
-Conflicts: firstboot(gui-backend)
-RemovePathPostfixes: .guixorg
-
-%description gui-xorg
-%{summary}.
-
-%files gui-xorg
-%{_libexecdir}/%{name}/run-gui-backend.guixorg
-%{_libexecdir}/%{name}/firstboot-windowmanager
-%endif
-
-# --------------------------------------------------------------------------
-
 %prep
 %autosetup -p 1
 
@@ -147,12 +124,6 @@ rm -rf *.egg-info
 # Remove the default link, provide subpackages for alternatives
 rm %{buildroot}%{_libexecdir}/%{name}/run-gui-backend
 
-%if ! %{with x11}
-# We do not want to ship X11 support anymore
-rm -v %{buildroot}%{_libexecdir}/%{name}/run-gui-backend.guixorg
-rm -v %{buildroot}%{_libexecdir}/%{name}/firstboot-windowmanager
-%endif
-
 %find_lang %{name}
 
 %changelog
diff --git a/scripts/firstboot-windowmanager b/scripts/firstboot-windowmanager
deleted file mode 100755
index dac7286..0000000
--- a/scripts/firstboot-windowmanager
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# This is the list of supported window manager binaries
-WMS=("gnome-kiosk" "metacity" "kwin_x11" "xfwm4" "openbox" "marco")
-
-run_gnome_kiosk()
-{
-    # Apply the anaconda overrides before running gnome-kiosk
-    if [ -z "$XDG_DATA_DIRS" ] ; then
-        new_data_dirs="/usr/share/anaconda/window-manager:/usr/share"
-    else
-        new_data_dirs="/usr/share/anaconda/window-manager:${XDG_DATA_DIRS}"
-    fi
-    XDG_DATA_DIRS="$new_data_dirs" $1 --x11 &
-}
-
-run_metacity()
-{
-    # Apply the anaconda overrides before running metacity
-    if [ -z "$XDG_DATA_DIRS" ] ; then
-        new_data_dirs="/usr/share/anaconda/window-manager:/usr/share"
-    else
-        new_data_dirs="/usr/share/anaconda/window-manager:${XDG_DATA_DIRS}"
-    fi
-    XDG_DATA_DIRS="$new_data_dirs" $1 &
-}
-
-# Get the application binary to start and remove it from
-# the argument list
-BINARY=$1
-shift
-
-for WM in ${WMS[@]}; do
-    FILE=$(which $WM 2>/dev/null)
-    FOUND=$?
-
-    if [ $FOUND -eq 0 -a -x "$FILE" ]; then
-        # start window manager
-        if [ "$WM" == "gnome-kiosk" ]; then
-            # if running gnome-kiosk apply the Anaconda/Initial Setup custom overrides
-            echo "Running gnome-kiosk with custom overrides" | systemd-cat -t initial-setup -p 6
-            run_gnome_kiosk "$FILE"
-        elif [ "$WM" == "metacity" ]; then
-            # if running Metacity apply the Anaconda/Initial Setup custom overrides
-            echo "Running Metacity with custom overrides" | systemd-cat -t initial-setup -p 6
-            run_metacity "$FILE"
-        else
-            echo "Running window manager ($FILE)" | systemd-cat -t initial-setup -p 6
-            "$FILE" &
-        fi
-
-        pid=$!
-
-        # start the application
-        echo "Running ($BINARY)" | systemd-cat -t initial-setup -p 6
-        $BINARY "$@"
-        res=$?
-
-        # stop window manager
-        echo "Stopping the window manager ($FILE)" | systemd-cat -t initial-setup -p 6
-        ps -p $pid >/dev/null && kill $pid
-
-        # return result
-        exit $res
-    fi
-done
-
-# No known window manager found
-echo "No supported window manager found!" | systemd-cat -t initial-setup -p 3
-exit 1
diff --git a/scripts/run-gui-backend.guixorg b/scripts/run-gui-backend.guixorg
deleted file mode 100755
index 3e09f53..0000000
--- a/scripts/run-gui-backend.guixorg
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-## Runs the GUI program from $@ in Xorg with one of the supported window managers
-
-WINDOWMANAGER_SCRIPT="/usr/libexec/initial-setup/firstboot-windowmanager"
-/bin/xinit ${WINDOWMANAGER_SCRIPT} $@ -- /bin/Xorg :9 -ac -nolisten tcp
diff --git a/setup.py b/setup.py
index 7edf090..4e04e09 100644
--- a/setup.py
+++ b/setup.py
@@ -27,9 +27,9 @@
               ('/etc/initial-setup/conf.d', glob('data/*.conf')),
               ('/etc/pam.d', glob('pam/*')),
               ('/usr/libexec/initial-setup/',
-              ["scripts/run-initial-setup", "scripts/firstboot-windowmanager",
+              ["scripts/run-initial-setup",
                "scripts/initial-setup-text", "scripts/initial-setup-graphical",
-               "scripts/run-gui-backend.guixorg", "scripts/run-gui-backend.guiweston",
+               "scripts/run-gui-backend.guiweston",
                "scripts/run-gui-backend",  # symlink to the default backend
                "scripts/reconfiguration-mode-enabled"]),
               ('/usr/share/doc/initial-setup/', ["ChangeLog"])]