From 8566b631be241793813bf6fea0d2f7f1b6d5852b Mon Sep 17 00:00:00 2001
From: BodgeMaster <>
Date: Sat, 15 Jul 2023 01:17:34 +0200
Subject: [PATCH] package selections: remove sections that will no longer be
 used

---
 notes_to_self.txt                             | 15 +------------
 package_selections/audio/description.txt      |  1 -
 package_selections/audio/none                 | 11 ----------
 package_selections/audio/options.lst          |  3 ---
 package_selections/audio/pipewire             | 16 --------------
 package_selections/audio/pipewire-slim        | 16 --------------
 package_selections/extras/all                 | 18 ----------------
 package_selections/extras/all-no-minecraft    | 18 ----------------
 package_selections/extras/description.txt     |  1 -
 package_selections/extras/desktop-backgrounds | 19 -----------------
 package_selections/extras/minecraft           | 17 ---------------
 package_selections/extras/minesweeper         | 18 ----------------
 package_selections/extras/none                | 11 ----------
 package_selections/extras/options.lst         |  7 -------
 package_selections/extras/snake               | 18 ----------------
 package_selections/multimedia/description.txt |  1 -
 package_selections/multimedia/none            | 11 ----------
 package_selections/multimedia/options.lst     |  2 --
 package_selections/multimedia/vlc             | 17 ---------------
 package_selections/pre-configure/bashrc       | 14 -------------
 .../pre-configure/description.txt             |  1 -
 .../pre-configure/gui-and-bashrc              | 17 ---------------
 package_selections/pre-configure/none         | 11 ----------
 package_selections/pre-configure/options.lst  |  3 ---
 package_selections/sections.lst               |  8 -------
 package_selections/systray/description.txt    |  1 -
 package_selections/systray/network            | 21 -------------------
 package_selections/systray/network-and-audio  | 21 -------------------
 package_selections/systray/none               | 11 ----------
 package_selections/systray/options.lst        |  3 ---
 package_selections/terminal/description.txt   |  1 -
 package_selections/terminal/lxterminal        | 16 --------------
 package_selections/terminal/none              | 11 ----------
 package_selections/terminal/options.lst       |  3 ---
 package_selections/terminal/xterm             | 16 --------------
 package_selections/utilities/description.txt  |  1 -
 .../utilities/desktop-integrated-guisysmon    | 18 ----------------
 .../utilities/desktop-integrated-htop         | 18 ----------------
 package_selections/utilities/none             | 11 ----------
 package_selections/utilities/options.lst      |  5 -----
 package_selections/utilities/xfe-guisysmon    | 18 ----------------
 package_selections/utilities/xfe-htop         | 16 --------------
 package_selections/web/description.txt        |  1 -
 package_selections/web/elinks                 | 12 -----------
 package_selections/web/evil                   | 16 --------------
 package_selections/web/firefox                | 16 --------------
 package_selections/web/firefox-esr            | 16 --------------
 package_selections/web/none                   | 11 ----------
 package_selections/web/options.lst            |  5 -----
 49 files changed, 1 insertion(+), 541 deletions(-)
 delete mode 100644 package_selections/audio/description.txt
 delete mode 100644 package_selections/audio/none
 delete mode 100644 package_selections/audio/options.lst
 delete mode 100644 package_selections/audio/pipewire
 delete mode 100644 package_selections/audio/pipewire-slim
 delete mode 100644 package_selections/extras/all
 delete mode 100644 package_selections/extras/all-no-minecraft
 delete mode 100644 package_selections/extras/description.txt
 delete mode 100644 package_selections/extras/desktop-backgrounds
 delete mode 100644 package_selections/extras/minecraft
 delete mode 100644 package_selections/extras/minesweeper
 delete mode 100644 package_selections/extras/none
 delete mode 100644 package_selections/extras/options.lst
 delete mode 100644 package_selections/extras/snake
 delete mode 100644 package_selections/multimedia/description.txt
 delete mode 100644 package_selections/multimedia/none
 delete mode 100644 package_selections/multimedia/options.lst
 delete mode 100644 package_selections/multimedia/vlc
 delete mode 100644 package_selections/pre-configure/bashrc
 delete mode 100644 package_selections/pre-configure/description.txt
 delete mode 100644 package_selections/pre-configure/gui-and-bashrc
 delete mode 100644 package_selections/pre-configure/none
 delete mode 100644 package_selections/pre-configure/options.lst
 delete mode 100644 package_selections/systray/description.txt
 delete mode 100644 package_selections/systray/network
 delete mode 100644 package_selections/systray/network-and-audio
 delete mode 100644 package_selections/systray/none
 delete mode 100644 package_selections/systray/options.lst
 delete mode 100644 package_selections/terminal/description.txt
 delete mode 100644 package_selections/terminal/lxterminal
 delete mode 100644 package_selections/terminal/none
 delete mode 100644 package_selections/terminal/options.lst
 delete mode 100644 package_selections/terminal/xterm
 delete mode 100644 package_selections/utilities/description.txt
 delete mode 100644 package_selections/utilities/desktop-integrated-guisysmon
 delete mode 100644 package_selections/utilities/desktop-integrated-htop
 delete mode 100644 package_selections/utilities/none
 delete mode 100644 package_selections/utilities/options.lst
 delete mode 100644 package_selections/utilities/xfe-guisysmon
 delete mode 100644 package_selections/utilities/xfe-htop
 delete mode 100644 package_selections/web/description.txt
 delete mode 100644 package_selections/web/elinks
 delete mode 100644 package_selections/web/evil
 delete mode 100644 package_selections/web/firefox
 delete mode 100644 package_selections/web/firefox-esr
 delete mode 100644 package_selections/web/none
 delete mode 100644 package_selections/web/options.lst

diff --git a/notes_to_self.txt b/notes_to_self.txt
index 105600f..d32f9c9 100644
--- a/notes_to_self.txt
+++ b/notes_to_self.txt
@@ -24,6 +24,7 @@ add online check to all the selections that need internet
 sort out /etc/resolv.conf for the chroot
 set keyboard layout for initramfs
 need some sort of notification handler?
+add a way to provide additional files to package selections
 replace package selections with these options:
   nvidia
     keep the old selections
@@ -88,20 +89,6 @@ replace package selections with these options:
         modify bashrc to display README
         put README.txt with relevant information on root dir of F2FS partition
           symlink to /home/README.txt
-  audio
-    remove
-  extras
-    remove
-  multimedia
-    remove
-  pre-configure
-    remove
-  systray
-    remove
-  utilities
-    remove
-  web
-    remove
 
 
 musl downsides:
diff --git a/package_selections/audio/description.txt b/package_selections/audio/description.txt
deleted file mode 100644
index 48abf68..0000000
--- a/package_selections/audio/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Choose which audio packages to install
diff --git a/package_selections/audio/none b/package_selections/audio/none
deleted file mode 100644
index 10dc7fd..0000000
--- a/package_selections/audio/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No audio"
-
-PACKAGES=""
-
-function post_install {
-  echo "audio/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/audio/options.lst b/package_selections/audio/options.lst
deleted file mode 100644
index 8a9a6bd..0000000
--- a/package_selections/audio/options.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-pipewire
-pipewire-slim
-none
diff --git a/package_selections/audio/pipewire b/package_selections/audio/pipewire
deleted file mode 100644
index 7a79d04..0000000
--- a/package_selections/audio/pipewire
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Pipewire with GUI settings (Pavucontrol)"
-
-PACKAGES="pipewire pavucontrol"
-
-function post_install {
-  echo "audio/pipewire" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/audio/pipewire-slim b/package_selections/audio/pipewire-slim
deleted file mode 100644
index 1df84fd..0000000
--- a/package_selections/audio/pipewire-slim
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Pipewire with text-based settings (pulsemixer)"
-
-PACKAGES="pipewire pulsemixer"
-
-function post_install {
-  echo "audio/pipewire-slim" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/extras/all b/package_selections/extras/all
deleted file mode 100644
index dc6a7bb..0000000
--- a/package_selections/extras/all
+++ /dev/null
@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="All of the above"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  # TODO: configure desktop backgounds if using IceWM
-  echo "extras/all" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/extras/all-no-minecraft b/package_selections/extras/all-no-minecraft
deleted file mode 100644
index 10e885b..0000000
--- a/package_selections/extras/all-no-minecraft
+++ /dev/null
@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="All of the above except Minecraft"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  # TODO: configure desktop backgounds if using IceWM
-  echo "extras/all-no-minecraft" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/extras/description.txt b/package_selections/extras/description.txt
deleted file mode 100644
index 7657627..0000000
--- a/package_selections/extras/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Choose some extras to install
diff --git a/package_selections/extras/desktop-backgrounds b/package_selections/extras/desktop-backgrounds
deleted file mode 100644
index 7705283..0000000
--- a/package_selections/extras/desktop-backgrounds
+++ /dev/null
@@ -1,19 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-DESCRIPTION="Add some desktop backgrounds and randomly choose one on login"
-
-PACKAGES=""
-
-function post_install {
-  # TODO: install wget
-  # TODO: configure
-  # TODO: remove wget
-  echo "extras/desktop-backgrounds" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/extras/minecraft b/package_selections/extras/minecraft
deleted file mode 100644
index 2b89841..0000000
--- a/package_selections/extras/minecraft
+++ /dev/null
@@ -1,17 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Prism Launcher for Minecraft"
-
-#TODO: Java stuff
-PACKAGES="PrismLauncher"
-
-function post_install {
-  echo "extras/minecraft" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/extras/minesweeper b/package_selections/extras/minesweeper
deleted file mode 100644
index 8f85baf..0000000
--- a/package_selections/extras/minesweeper
+++ /dev/null
@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="??? (Minesweeper)"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "extras/minesweeper" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/extras/none b/package_selections/extras/none
deleted file mode 100644
index f5a74a6..0000000
--- a/package_selections/extras/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="None"
-
-PACKAGES=""
-
-function post_install {
-  echo "extras/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/extras/options.lst b/package_selections/extras/options.lst
deleted file mode 100644
index a5e4bdf..0000000
--- a/package_selections/extras/options.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-desktop-backgrounds
-minesweeper
-snake
-minecraft
-all-no-minecraft
-all
-none
diff --git a/package_selections/extras/snake b/package_selections/extras/snake
deleted file mode 100644
index 0932a53..0000000
--- a/package_selections/extras/snake
+++ /dev/null
@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="nSnake"
-
-#TODO
-PACKAGES="nSnake"
-
-function post_install {
-  echo "extras/snake" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/multimedia/description.txt b/package_selections/multimedia/description.txt
deleted file mode 100644
index e8628cc..0000000
--- a/package_selections/multimedia/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Install a media player?
diff --git a/package_selections/multimedia/none b/package_selections/multimedia/none
deleted file mode 100644
index 071bbeb..0000000
--- a/package_selections/multimedia/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No"
-
-PACKAGES=""
-
-function post_install {
-  echo "multimedia/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/multimedia/options.lst b/package_selections/multimedia/options.lst
deleted file mode 100644
index aa387a6..0000000
--- a/package_selections/multimedia/options.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-vlc
-none
diff --git a/package_selections/multimedia/vlc b/package_selections/multimedia/vlc
deleted file mode 100644
index 144282d..0000000
--- a/package_selections/multimedia/vlc
+++ /dev/null
@@ -1,17 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Install VLC"
-
-#TODO: fluidsynth MIDI stuff
-PACKAGES="vlc"
-
-function post_install {
-  echo "multimedia/vlc" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/pre-configure/bashrc b/package_selections/pre-configure/bashrc
deleted file mode 100644
index 285d8b9..0000000
--- a/package_selections/pre-configure/bashrc
+++ /dev/null
@@ -1,14 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="Only add custom bashrc (advanced users)"
-
-PACKAGES=""
-
-function post_install {
-  #TODO: configure things
-  # (probably by barfing the bashrc using echo)
-
-  echo "pre-configure/bashrc" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/pre-configure/description.txt b/package_selections/pre-configure/description.txt
deleted file mode 100644
index 25f8342..0000000
--- a/package_selections/pre-configure/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Do you want some quality-of-life configuration done?
diff --git a/package_selections/pre-configure/gui-and-bashrc b/package_selections/pre-configure/gui-and-bashrc
deleted file mode 100644
index d08514e..0000000
--- a/package_selections/pre-configure/gui-and-bashrc
+++ /dev/null
@@ -1,17 +0,0 @@
-function check {
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Auto-start GUI session on login and add custom bashrc (recommended)"
-
-PACKAGES=""
-
-function post_install {
-  #TODO: configure things
-
-  echo "pre-configure/gui-and-bashrc" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/pre-configure/none b/package_selections/pre-configure/none
deleted file mode 100644
index 2ee7673..0000000
--- a/package_selections/pre-configure/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No (advanced users)"
-
-PACKAGES=""
-
-function post_install {
-  echo "pre-configure/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/pre-configure/options.lst b/package_selections/pre-configure/options.lst
deleted file mode 100644
index 019e1cb..0000000
--- a/package_selections/pre-configure/options.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-gui-and-bashrc
-bashrc
-none
diff --git a/package_selections/sections.lst b/package_selections/sections.lst
index a1d09b0..0b3a7ab 100644
--- a/package_selections/sections.lst
+++ b/package_selections/sections.lst
@@ -1,10 +1,2 @@
 nvidia
 desktop
-audio
-systray
-terminal
-utilities
-pre-configure
-web
-multimedia
-extras
diff --git a/package_selections/systray/description.txt b/package_selections/systray/description.txt
deleted file mode 100644
index b67bc48..0000000
--- a/package_selections/systray/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Do you want to install system tray applets?
diff --git a/package_selections/systray/network b/package_selections/systray/network
deleted file mode 100644
index 2f5a609..0000000
--- a/package_selections/systray/network
+++ /dev/null
@@ -1,21 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
-    if grep "audio/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
-DESCRIPTION="Add tray icon for network"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "systray/network" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/systray/network-and-audio b/package_selections/systray/network-and-audio
deleted file mode 100644
index c8d0229..0000000
--- a/package_selections/systray/network-and-audio
+++ /dev/null
@@ -1,21 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
-    if grep "audio/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-      return 1
-    else
-      return 0
-    fi
-  else
-    return 1
-  fi
-}
-
-DESCRIPTION="Add tray icon for network and audio"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "systray/network-and-audio" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/systray/none b/package_selections/systray/none
deleted file mode 100644
index 8b06d96..0000000
--- a/package_selections/systray/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="Don’t install additional tray icons"
-
-PACKAGES=""
-
-function post_install {
-  echo "systray/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/systray/options.lst b/package_selections/systray/options.lst
deleted file mode 100644
index a3736a3..0000000
--- a/package_selections/systray/options.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-network-and-audio
-network
-none
diff --git a/package_selections/terminal/description.txt b/package_selections/terminal/description.txt
deleted file mode 100644
index 134cae5..0000000
--- a/package_selections/terminal/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Which GUI terminal emulator do you want to install?
diff --git a/package_selections/terminal/lxterminal b/package_selections/terminal/lxterminal
deleted file mode 100644
index 0834ef9..0000000
--- a/package_selections/terminal/lxterminal
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="LXDE Terminal (recommended)"
-
-PACKAGES="lxterminal"
-
-function post_install {
-  echo "terminal/lxterminal" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/terminal/none b/package_selections/terminal/none
deleted file mode 100644
index 1f6318b..0000000
--- a/package_selections/terminal/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="None (advanced users only)"
-
-PACKAGES="none"
-
-function post_install {
-  echo "terminal/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/terminal/options.lst b/package_selections/terminal/options.lst
deleted file mode 100644
index 12fb9cd..0000000
--- a/package_selections/terminal/options.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-lxterminal
-xterm
-none
diff --git a/package_selections/terminal/xterm b/package_selections/terminal/xterm
deleted file mode 100644
index 38849b4..0000000
--- a/package_selections/terminal/xterm
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Xterm"
-
-PACKAGES="xterm"
-
-function post_install {
-  echo "terminal/xterm" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/utilities/description.txt b/package_selections/utilities/description.txt
deleted file mode 100644
index 033d14f..0000000
--- a/package_selections/utilities/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Which set of desktop utilities do you want to install?
diff --git a/package_selections/utilities/desktop-integrated-guisysmon b/package_selections/utilities/desktop-integrated-guisysmon
deleted file mode 100644
index 7eca643..0000000
--- a/package_selections/utilities/desktop-integrated-guisysmon
+++ /dev/null
@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="Fully featured (list of things) (recommended)"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "utilities/desktop-integrated-guisysmon" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/utilities/desktop-integrated-htop b/package_selections/utilities/desktop-integrated-htop
deleted file mode 100644
index 5d2b444..0000000
--- a/package_selections/utilities/desktop-integrated-htop
+++ /dev/null
@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="Fully featured (list of things with htop)"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "utilities/desktop-integrated-htop" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/utilities/none b/package_selections/utilities/none
deleted file mode 100644
index 47552a1..0000000
--- a/package_selections/utilities/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="None"
-
-PACKAGES=""
-
-function post_install {
-  echo "utilities/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/utilities/options.lst b/package_selections/utilities/options.lst
deleted file mode 100644
index 511a989..0000000
--- a/package_selections/utilities/options.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-desktop-integrated-guisysmon
-xfe-guisysmon
-desktop-integrated-htop
-xfe-htop
-none
diff --git a/package_selections/utilities/xfe-guisysmon b/package_selections/utilities/xfe-guisysmon
deleted file mode 100644
index 4b3bd82..0000000
--- a/package_selections/utilities/xfe-guisysmon
+++ /dev/null
@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="Smaller set of desktop utilities (XFE + ???)"
-
-#TODO
-PACKAGES="xfe"
-
-function post_install {
-  echo "utilities/xfe-guisysmon" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/utilities/xfe-htop b/package_selections/utilities/xfe-htop
deleted file mode 100644
index 0eefdab..0000000
--- a/package_selections/utilities/xfe-htop
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Smaller set of desktop utilities (XFE + Htop)"
-
-PACKAGES="xfe htop"
-
-function post_install {
-  echo "utilities/xfe-htop" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/web/description.txt b/package_selections/web/description.txt
deleted file mode 100644
index 29a6255..0000000
--- a/package_selections/web/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Install a web browser?
diff --git a/package_selections/web/elinks b/package_selections/web/elinks
deleted file mode 100644
index 270f3dd..0000000
--- a/package_selections/web/elinks
+++ /dev/null
@@ -1,12 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  return 0
-}
-
-DESCRIPTION="Install ELinks (terminal-based browser)"
-
-PACKAGES="elinks"
-
-function post_install {
-  echo "web/elinks" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/web/evil b/package_selections/web/evil
deleted file mode 100644
index 87b27cc..0000000
--- a/package_selections/web/evil
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Join the dark side with Chromium (Consider Firefox... You can still install Chromium later.)"
-
-PACKAGES="chromium"
-
-function post_install {
-  echo "web/evil" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/web/firefox b/package_selections/web/firefox
deleted file mode 100644
index 3973348..0000000
--- a/package_selections/web/firefox
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Install Firefox (recommended)"
-
-PACKAGES="firefox"
-
-function post_install {
-  echo "web/firefox" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/web/firefox-esr b/package_selections/web/firefox-esr
deleted file mode 100644
index ab15bde..0000000
--- a/package_selections/web/firefox-esr
+++ /dev/null
@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Install Firefox - Extended Support Release (ESR)"
-
-PACKAGES="firefox-esr"
-
-function post_install {
-  echo "web/firefox-esr" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/web/none b/package_selections/web/none
deleted file mode 100644
index faa41dc..0000000
--- a/package_selections/web/none
+++ /dev/null
@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No web browser"
-
-PACKAGES=""
-
-function post_install {
-  echo "web/none" >> /tmp/stage-2-choices
-}
diff --git a/package_selections/web/options.lst b/package_selections/web/options.lst
deleted file mode 100644
index e0a6273..0000000
--- a/package_selections/web/options.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-firefox
-firefox-esr
-evil
-elinks
-none