From 38d67f5412ce30c4644f1d5aad42389109688345 Mon Sep 17 00:00:00 2001
From: Digital Sleuth <62841822+digitalsleuth@users.noreply.github.com>
Date: Fri, 27 Jan 2023 20:47:55 +0000
Subject: [PATCH] Remove bionic / xenial support (#79)

* Remove bionic / xenial support

* Fix tests and terminal requirements

* Fix DBUS issue and dbus requirements

* Forgot to remove previous DBUS entry
---
 .ci/debug.sh                                  |  2 +-
 .ci/test-all.sh                               |  5 +-
 .github/workflows/tests.yml                   |  6 +--
 .github/workflows/weekly-tests.yml            |  6 +--
 sift/config/user/files/rekall-profile.txt     |  4 --
 ...files_bionic.txt => terminal-profiles.txt} |  0
 .../user/files/terminal-profiles_xenial.txt   | 14 -----
 sift/config/user/terminal.sls                 | 18 +++++--
 sift/files/samba/smb.conf                     |  6 ---
 sift/packages/absent/plaso.sls                | 53 -------------------
 sift/packages/arc-icons.sls                   | 20 -------
 sift/packages/arc-theme.sls                   | 21 --------
 sift/packages/bcrypt.sls                      | 15 ------
 sift/packages/dbus-x11.sls                    |  2 +
 sift/packages/dconf-cli.sls                   |  2 +
 sift/packages/dconf-tools.sls                 |  8 ---
 sift/packages/init.sls                        | 12 +----
 sift/packages/magnus.sls                      | 12 -----
 sift/packages/netcat.sls                      |  5 --
 sift/packages/phonon.sls                      |  7 +--
 sift/packages/powershell_bionic.sls           | 18 -------
 sift/packages/python-nids.sls                 |  7 ---
 sift/packages/python2-pip.sls                 |  9 ----
 sift/packages/python2.sls                     |  7 +--
 sift/packages/python3-debian.sls              |  3 ++
 sift/packages/python3-dfvfs.sls               | 14 +----
 sift/packages/python3-fuse.sls                |  7 +--
 sift/packages/python3-plaso.sls               |  2 -
 sift/packages/python3-pyqt5.sls               |  7 +--
 sift/packages/python3-xlsxwriter.sls          | 14 +----
 sift/packages/samdump2.sls                    |  7 +--
 sift/packages/software-properties-common.sls  |  8 +--
 sift/packages/system-config-samba.sls         |  8 ---
 sift/packages/xpdf.sls                        | 10 ----
 sift/python-packages/appcompatprocessor.sls   | 20 -------
 sift/python-packages/distorm3.sls             | 15 ------
 sift/python-packages/m2crypto.sls             | 20 -------
 sift/repos/init.sls                           |  2 -
 sift/repos/noobslab.sls                       | 23 --------
 sift/tests/gift.sls                           |  2 -
 sift/tests/libewf.sls                         | 10 ++--
 41 files changed, 41 insertions(+), 390 deletions(-)
 delete mode 100644 sift/config/user/files/rekall-profile.txt
 rename sift/config/user/files/{terminal-profiles_bionic.txt => terminal-profiles.txt} (100%)
 delete mode 100644 sift/config/user/files/terminal-profiles_xenial.txt
 delete mode 100644 sift/packages/absent/plaso.sls
 delete mode 100644 sift/packages/arc-icons.sls
 delete mode 100644 sift/packages/arc-theme.sls
 delete mode 100644 sift/packages/bcrypt.sls
 create mode 100644 sift/packages/dbus-x11.sls
 create mode 100644 sift/packages/dconf-cli.sls
 delete mode 100644 sift/packages/dconf-tools.sls
 delete mode 100644 sift/packages/powershell_bionic.sls
 delete mode 100644 sift/packages/python-nids.sls
 create mode 100644 sift/packages/python3-debian.sls
 delete mode 100644 sift/packages/system-config-samba.sls
 delete mode 100644 sift/packages/xpdf.sls
 delete mode 100644 sift/repos/noobslab.sls

diff --git a/.ci/debug.sh b/.ci/debug.sh
index eed29e6..9ecd7b5 100755
--- a/.ci/debug.sh
+++ b/.ci/debug.sh
@@ -2,7 +2,7 @@
 
 set -x
 
-DISTRO=${DISTRO:="bionic"}
+DISTRO=${DISTRO:="focal"}
 STATE=$1
 SIFT_VERSION=${2:-stable}
 
diff --git a/.ci/test-all.sh b/.ci/test-all.sh
index 7b224b7..d16ee36 100755
--- a/.ci/test-all.sh
+++ b/.ci/test-all.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-SIFT_VERSION=${1:-stable}
+DISTRO=${DISTRO:="focal"}
+STATE=$1
 
-docker run -it --rm --name="sift-package-${STATE}" -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN sift-saltstack:bionic /bin/bash
+docker run -it --rm --name="sift-package-${STATE}" -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN teamdfir/sift-saltstack-tester:$DISTRO /bin/bash
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 396a029..c37ce53 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,11 +32,9 @@ jobs:
     strategy:
       matrix:
         salt: [3004, 3005]
-        os: [18.04, 20.04]
+        os: [20.04]
         state: ${{ fromJson(needs.changed_states.outputs.matrix) }}
         include:
-          - os: 18.04
-            code: bionic
           - os: 20.04
             code: focal
           #Note: disabled until we support jammy
@@ -45,8 +43,6 @@ jobs:
         exclude:
           - salt: 3004
             os: 22.04
-          - salt: 3005
-            os: 18.04
 
     container:
       image: docker://ghcr.io/teamdfir/sift-saltstack-tester:${{ matrix.salt }}-${{ matrix.code }}
diff --git a/.github/workflows/weekly-tests.yml b/.github/workflows/weekly-tests.yml
index 2327ca0..005b41d 100644
--- a/.github/workflows/weekly-tests.yml
+++ b/.github/workflows/weekly-tests.yml
@@ -12,15 +12,13 @@ jobs:
     strategy:
       matrix:
         salt: [3004, 3005]
-        os: [18.04, 20.04]
+        os: [20.04]
         state:
           - sift.packages.python2
           - sift.packages.python3
           - sift.tests.gift
           - sift.config.user.pdfs
         include:
-          - os: 18.04
-            code: bionic
           - os: 20.04
             code: focal
           - os: 22.04
@@ -28,8 +26,6 @@ jobs:
         exclude:
           - salt: 3004
             os: 22.04
-          - salt: 3005
-            os: 18.04
 
     container:
       image: docker://ghcr.io/teamdfir/sift-saltstack-tester:${{ matrix.salt }}-${{ matrix.code }}
diff --git a/sift/config/user/files/rekall-profile.txt b/sift/config/user/files/rekall-profile.txt
deleted file mode 100644
index 5775557..0000000
--- a/sift/config/user/files/rekall-profile.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cache_dir: .rekall_cache
-repository_path:
-  - https://github.com/google/rekall-profiles/raw/master
-  - http://profiles.rekall-forensic.com
diff --git a/sift/config/user/files/terminal-profiles_bionic.txt b/sift/config/user/files/terminal-profiles.txt
similarity index 100%
rename from sift/config/user/files/terminal-profiles_bionic.txt
rename to sift/config/user/files/terminal-profiles.txt
diff --git a/sift/config/user/files/terminal-profiles_xenial.txt b/sift/config/user/files/terminal-profiles_xenial.txt
deleted file mode 100644
index 786ca0f..0000000
--- a/sift/config/user/files/terminal-profiles_xenial.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-[legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9]
-foreground-color='rgb(131,148,150)'
-visible-name='SIFT'
-palette=['rgb(46,52,54)', 'rgb(204,0,0)', 'rgb(78,154,6)', 'rgb(196,160,0)', 'rgb(52,101,164)', 'rgb(117,80,123)', 'rgb(6,152,154)', 'rgb(211,215,207)', 'rgb(85,87,83)', 'rgb(239,41,41)', 'rgb(206,6,6)', 'rgb(252,233,79)', 'rgb(114,159,207)', 'rgb(173,127,168)', 'rgb(52,226,226)', 'rgb(238,238,236)']
-default-size-columns=90
-default-size-rows=30
-use-transparent-background=true
-use-theme-colors=false
-use-theme-transparency=false
-background-color='rgb(13,18,20)'
-background-transparency-percent=18
-
-[legacy]
-schema-version=uint32 3
diff --git a/sift/config/user/terminal.sls b/sift/config/user/terminal.sls
index c61ef1d..7e90144 100644
--- a/sift/config/user/terminal.sls
+++ b/sift/config/user/terminal.sls
@@ -4,12 +4,15 @@
 {%- else -%}
   {%- set home = salt['user.info'](user).home -%}
 {%- endif -%}
-{%- set dbus_address = salt['cmd.run']("dbus-launch | grep DBUS_SESSION_BUS_ADDRESS | cut -d= -f2-", shell="/bin/bash", runas=user, cwd=home, python_shell=True) -%}
+
+include:
+  - sift.packages.dconf-cli
+  - sift.packages.dbus-x11
 
 sift-config-terminal-profiles-file:
   file.managed:
     - name: /usr/share/sift/terminal-profiles.txt
-    - source: salt://sift/config/user/files/terminal-profiles_bionic.txt
+    - source: salt://sift/config/user/files/terminal-profiles.txt
     - user: root
     - group: root
     - mode: 0644
@@ -21,9 +24,16 @@ sift-config-terminal-profiles-install:
     - runas: {{ user }}
     - cwd: {{ home }}
     - shell: /bin/bash
-    - env:
-      - DBUS_SESSION_BUS_ADDRESS: "{{ dbus_address }}"
+    - onlyif:
+      - fun: cmd.run
+        cmd: export DBUS_SESSION_BUS_ADDRESS=$(dbus-launch | grep DBUS_SESSION_BUS_ADDRESS | cut -d= -f2-)
+        shell: /bin/bash
+        python_shell: True
+        runas: {{ user }}
     - require:
       - file: sift-config-terminal-profiles-file
+      - sls: sift.packages.dconf-cli
+      - sls: sift.packages.dbus-x11
     - watch:
       - file: sift-config-terminal-profiles-file
+
diff --git a/sift/files/samba/smb.conf b/sift/files/samba/smb.conf
index a46bb0d..3dd902b 100644
--- a/sift/files/samba/smb.conf
+++ b/sift/files/samba/smb.conf
@@ -5,12 +5,6 @@ netbios name = SIFTWORKSTATION
 security = USER
 map to guest = Bad User 
 dns proxy = no
-{% if grains['oscodename'] == "xenial" -%}
-name resolve order = host bcast lmhost wins
-{% endif -%}
-{% if grains['oscodename'] == "bionic" -%}
-name resolve order = host bcast wins
-{% endif -%}
 
 include = /etc/samba/smb-%L.conf
 guest account = {{ user }}
diff --git a/sift/packages/absent/plaso.sls b/sift/packages/absent/plaso.sls
deleted file mode 100644
index 126534f..0000000
--- a/sift/packages/absent/plaso.sls
+++ /dev/null
@@ -1,53 +0,0 @@
-{% if salt['pkg.version']('python-plaso') == "1.4.0-1ppa3~xenial" %}
-python-plaso-1.4.0-hold-fix:
-  pkg.installed:
-    - name: python-plaso
-    - version: 1.4.0-1ppa3~xenial
-    - hold: False
-    - update_holds: True
-    - allow_updates: True
-    - require_in:
-      - pkg: python-plaso-1.4.0-removed
-{% endif %}
-
-{% if salt['pkg.version']('python-dfvfs') == "20160108-1ppa1~xenial" %}
-python-dfvfs-20160108-hold-fix:
-  pkg.installed:
-    - name: python-dfvfs
-    - version: 20160108-1ppa1~xenial
-    - hold: False
-    - update_holds: True
-    - allow_updates: True
-    {% if salt['pkg.version']('python-plaso') == "1.4.0-1ppa3~xenial" %}
-    - require:
-      - pkg: python-plaso-1.4.0-hold-fix
-    {% endif %}
-    - require_in:
-      - pkg: python-dfvfs-20160108-removed
-{% endif %}
-
-python-plaso-1.4.0-removed:
-  pkg.removed:
-    - name: python-plaso
-    - version: 1.4.0-1ppa3~xenial
-    - hold: False
-    - update_holds: True
-    - allow_updates: True
-
-python-dfvfs-20160108-removed:
-  pkg.removed:
-    - name: python-dfvfs
-    - version: 20160108-1ppa1~xenial
-    - hold: False
-    - update_holds: True
-    - allow_updates: True
-    - require:
-      - pkg: python-plaso-1.4.0-removed
-
-python-plaso-py2-removed:
-  pkg.removed:
-    - name: python-plaso
-    - version: 20191203-1ppa1~bionic
-    - hold: False
-    - update_holds: True
-    - allow_updates: True
\ No newline at end of file
diff --git a/sift/packages/arc-icons.sls b/sift/packages/arc-icons.sls
deleted file mode 100644
index 8ca3a7a..0000000
--- a/sift/packages/arc-icons.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-# Name: arc-icons
-# Website: https://github.com/horst3180/arc-icon-theme
-# Description: ARC-Icon set from the noobslab repo
-# Category: 
-# Author: https://github.com/horst3180/arc-icon-theme/blob/master/CREDITS
-# License: GNU General Public License v3 (https://github.com/horst3180/arc-icon-theme/blob/master/COPYING)
-# Notes: 
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.repos.noobslab
-
-sift-package-arc-icons:
-  pkg.installed:
-    - name: arc-icons
-    - require:
-      - pkgrepo: sift-repo-noobslab-icons
-{%- else %}
-sift-package-arc-icons:
-  test.nop
-{%- endif %}
diff --git a/sift/packages/arc-theme.sls b/sift/packages/arc-theme.sls
deleted file mode 100644
index 1ddd14d..0000000
--- a/sift/packages/arc-theme.sls
+++ /dev/null
@@ -1,21 +0,0 @@
-# Name: arc-theme
-# Website: http://ppa.launchpad.net/noobslab/icons/ubuntu/pool/main/
-# Description: ARC-theme from the noobslab repo
-# Category: 
-# Author: https://github.com/horst3180/arc-theme/blob/master/AUTHORS
-# License: GNU General Public License v3 (https://github.com/horst3180/arc-theme/blob/master/COPYING)
-# Notes: 
-
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.repos.noobslab
-
-sift-package-arc-theme:
-  pkg.installed:
-    - name: arc-theme
-    - require:
-      - pkgrepo: sift-repo-noobslab-themes
-{%- else %}
-sift-package-arc-theme:
-  test.nop
-{%- endif %}
diff --git a/sift/packages/bcrypt.sls b/sift/packages/bcrypt.sls
deleted file mode 100644
index 440274e..0000000
--- a/sift/packages/bcrypt.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-# Name: bcrypt
-# Website: http://bcrypt.sourceforge.net/index.html
-# Description: Cross-platform file encryption tool
-# Category: 
-# Author: Johnny Shelley, Philip Stolarczyk
-# License: Copyright (c) 2002 Johnny Shelley All rights reserved (bcrypt.sourceforge.net/index.html)
-# Notes: 
-{%- if grains['oscodename'] == "bionic" %}
-sift-package-bcrypt:
-  pkg.installed:
-    - name: bcrypt
-{%- else %}
-sift-package-bcrypt:
-  test.nop
-{%- endif %}
diff --git a/sift/packages/dbus-x11.sls b/sift/packages/dbus-x11.sls
new file mode 100644
index 0000000..10d38f6
--- /dev/null
+++ b/sift/packages/dbus-x11.sls
@@ -0,0 +1,2 @@
+dbus-x11:
+  pkg.installed
diff --git a/sift/packages/dconf-cli.sls b/sift/packages/dconf-cli.sls
new file mode 100644
index 0000000..26a9479
--- /dev/null
+++ b/sift/packages/dconf-cli.sls
@@ -0,0 +1,2 @@
+dconf-cli:
+  pkg.installed
diff --git a/sift/packages/dconf-tools.sls b/sift/packages/dconf-tools.sls
deleted file mode 100644
index c31bcb1..0000000
--- a/sift/packages/dconf-tools.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-{%- if grains['oscodename'] == "bionic" %}
-sift-package-dconf-tools:
-  pkg.installed:
-    - name: dconf-tools
-{%- else %}
-sift-package-dconf-tools:
-  test.nop
-{%- endif %}
\ No newline at end of file
diff --git a/sift/packages/init.sls b/sift/packages/init.sls
index c483c89..d2bcf89 100644
--- a/sift/packages/init.sls
+++ b/sift/packages/init.sls
@@ -7,7 +7,6 @@ include:
   - sift.packages.arp-scan
   - sift.packages.autopsy
   - sift.packages.avfs
-  - sift.packages.bcrypt
   - sift.packages.bless
   - sift.packages.blt
   - sift.packages.build-essential
@@ -23,7 +22,6 @@ include:
   - sift.packages.curl
   - sift.packages.dc3dd
   - sift.packages.dcfldd
-  - sift.packages.dconf-tools
   - sift.packages.default-jre
   - sift.packages.disktype
   - sift.packages.docker
@@ -144,8 +142,8 @@ include:
   - sift.packages.powershell
   - sift.packages.pv
   - sift.packages.python-flowgrep
-  - sift.packages.python-nids
   - sift.packages.python3
+  - sift.packages.python3-debian
   - sift.packages.python3-dev
   - sift.packages.python3-dfvfs
   - sift.packages.python3-fuse
@@ -175,7 +173,6 @@ include:
   - sift.packages.ssldump
   - sift.packages.sslsniff
   - sift.packages.stunnel4
-  - sift.packages.system-config-samba
   - sift.packages.tcl
   - sift.packages.tcpflow
   - sift.packages.tcpick
@@ -201,7 +198,6 @@ include:
   - sift.packages.xdot
   - sift.packages.xfsprogs
   - sift.packages.xmount
-  - sift.packages.xpdf
   - sift.packages.zenity
 
 sift-packages:
@@ -215,7 +211,6 @@ sift-packages:
       - sls: sift.packages.arp-scan
       - sls: sift.packages.autopsy
       - sls: sift.packages.avfs
-      - sls: sift.packages.bcrypt
       - sls: sift.packages.bless
       - sls: sift.packages.blt
       - sls: sift.packages.build-essential
@@ -231,7 +226,6 @@ sift-packages:
       - sls: sift.packages.curl
       - sls: sift.packages.dc3dd
       - sls: sift.packages.dcfldd
-      - sls: sift.packages.dconf-tools
       - sls: sift.packages.default-jre
       - sls: sift.packages.disktype
       - sls: sift.packages.docker
@@ -352,8 +346,8 @@ sift-packages:
       - sls: sift.packages.powershell
       - sls: sift.packages.pv
       - sls: sift.packages.python-flowgrep
-      - sls: sift.packages.python-nids
       - sls: sift.packages.python3
+      - sls: sift.packages.python3-debian
       - sls: sift.packages.python3-dev
       - sls: sift.packages.python3-dfvfs
       - sls: sift.packages.python3-fuse
@@ -383,7 +377,6 @@ sift-packages:
       - sls: sift.packages.ssldump
       - sls: sift.packages.sslsniff
       - sls: sift.packages.stunnel4
-      - sls: sift.packages.system-config-samba
       - sls: sift.packages.tcl
       - sls: sift.packages.tcpflow
       - sls: sift.packages.tcpick
@@ -409,5 +402,4 @@ sift-packages:
       - sls: sift.packages.xdot
       - sls: sift.packages.xfsprogs
       - sls: sift.packages.xmount
-      - sls: sift.packages.xpdf
       - sls: sift.packages.zenity
diff --git a/sift/packages/magnus.sls b/sift/packages/magnus.sls
index 25a186b..c2c9260 100644
--- a/sift/packages/magnus.sls
+++ b/sift/packages/magnus.sls
@@ -6,17 +6,5 @@
 # License: MIT License (https://github.com/stuartlangridge/magnus/blob/master/LICENSE)
 # Notes: magnus
 
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.repos.flexiondotorg
-
-magnus:
-  pkg.installed:
-    - require:
-      - sls: sift.repos.flexiondotorg
-
-{%- elif grains['oscodename'] == "focal" %}
 magnus:
   pkg.installed
-
-{%- endif -%}
diff --git a/sift/packages/netcat.sls b/sift/packages/netcat.sls
index 951ec60..3d6058e 100644
--- a/sift/packages/netcat.sls
+++ b/sift/packages/netcat.sls
@@ -1,7 +1,2 @@
-{% if grains['oscodename'] == "bionic" -%}
-netcat-openbsd:
-  pkg.installed
-{% else %}
 netcat:
   pkg.installed
-{%- endif -%}
diff --git a/sift/packages/phonon.sls b/sift/packages/phonon.sls
index 9fca039..7ce1d32 100644
--- a/sift/packages/phonon.sls
+++ b/sift/packages/phonon.sls
@@ -1,8 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'bionic': 'phonon',
-  'focal': 'phonon4qt5'
-}, grain='oscodename') %}
-
 sift-package-phonon:
   pkg.installed:
-    - name: {{ package_name }}
\ No newline at end of file
+    - name: phonon4qt5
diff --git a/sift/packages/powershell_bionic.sls b/sift/packages/powershell_bionic.sls
deleted file mode 100644
index a3a96bc..0000000
--- a/sift/packages/powershell_bionic.sls
+++ /dev/null
@@ -1,18 +0,0 @@
-{%- set base_url = "https://github.com/Powershell/Powershell/releases/download/v" -%}
-{%- set version = "6.2.0" -%}
-{%- set filename = "powershell_6.2.0-1.ubuntu.18.04_amd64.deb" -%}
-{%- set hash = "38dcb2164c1fe3b4f0200aba2d5969c4856526baa1d8983f818cd06003c355ce" -%}
-
-sift-powershell-source:
-  file.managed:
-    - name: /var/cache/sift/archives/{{ filename }}
-    - source: "{{ base_url }}{{ version }}/{{ filename }}"
-    - source_hash: sha256={{ hash }}
-    - makedirs: True
-
-sift-powershell:
-  pkg.installed:
-    - sources:
-      - powershell: /var/cache/sift/archives/{{ filename }}
-    - watch:
-      - file: sift-powershell-source
diff --git a/sift/packages/python-nids.sls b/sift/packages/python-nids.sls
deleted file mode 100644
index 900e498..0000000
--- a/sift/packages/python-nids.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-{%- if grains['oscodename'] == "bionic" %}
-python-nids:
-  pkg.installed
-{%- else %}
-python-nids:
-  test.nop
-{%- endif %}
\ No newline at end of file
diff --git a/sift/packages/python2-pip.sls b/sift/packages/python2-pip.sls
index be9d6d7..c4c4118 100644
--- a/sift/packages/python2-pip.sls
+++ b/sift/packages/python2-pip.sls
@@ -2,14 +2,6 @@ include:
   - sift.packages.python2
   - sift.packages.curl
 
-{%- if grains['oscodename'] == "bionic" %}
-sift-package-python2-pip:
-  pkg.installed:
-    - name: python-pip
-    - require:
-      - sls: sift.packages.python2
-
-{%- elif grains['oscodename'] == "focal" %}
 sift-package-python2-pip-install-script:
   cmd.run:
     - name: curl -o /tmp/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py 
@@ -24,4 +16,3 @@ sift-package-python2-pip-install:
     - unless: which pip2
     - require:
       - cmd: sift-package-python2-pip-install-script
-{%- endif %}
diff --git a/sift/packages/python2.sls b/sift/packages/python2.sls
index c10767a..ccbd59d 100644
--- a/sift/packages/python2.sls
+++ b/sift/packages/python2.sls
@@ -1,8 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'bionic': 'python',
-  'focal': 'python2'
-}, grain='oscodename') %}
-
 sift-package-python2:
   pkg.installed:
-    - name: {{ package_name }}
+    - name: python2
diff --git a/sift/packages/python3-debian.sls b/sift/packages/python3-debian.sls
new file mode 100644
index 0000000..fb06856
--- /dev/null
+++ b/sift/packages/python3-debian.sls
@@ -0,0 +1,3 @@
+python3-debian:
+  pkg.installed:
+    - reinstall: True
diff --git a/sift/packages/python3-dfvfs.sls b/sift/packages/python3-dfvfs.sls
index 4ae269a..7eac6b3 100644
--- a/sift/packages/python3-dfvfs.sls
+++ b/sift/packages/python3-dfvfs.sls
@@ -1,27 +1,15 @@
-{% set package_name = salt['grains.filter_by']({
-  'xenial': 'python-dfvfs',
-  'bionic': 'python-dfvfs',
-  'focal': 'python3-dfvfs'
-}, grain='oscodename') %}
-
 include:
   - sift.repos.sift
   - sift.repos.gift
-  {% if grains['oscodename'] == "xenial" -%}
-  - sift.packages.absent.plaso
-  {% endif %}
 
 sift-package-python3-dfvfs:
   pkg.installed:
-    - name: {{ package_name }}
+    - name: python3-dfvfs
     - version: latest
     - hold: False
     - refresh: True
     - update_holds: True
     - allow_updates: True
     - require:
-      {% if grains['oscodename'] == "xenial" -%}
-      - sls: sift.packages.absent.plaso
-      {% endif -%}
       - sls: sift.repos.sift
       - sls: sift.repos.gift
diff --git a/sift/packages/python3-fuse.sls b/sift/packages/python3-fuse.sls
index 4ac02ad..952db93 100644
--- a/sift/packages/python3-fuse.sls
+++ b/sift/packages/python3-fuse.sls
@@ -1,8 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'bionic': 'python-fuse',
-  'focal': 'python3-fuse'
-}, grain='oscodename') %}
-
 sift-package-python3-fuse:
   pkg.installed:
-    - name: {{ package_name }}
\ No newline at end of file
+    - name: python3-fuse
diff --git a/sift/packages/python3-plaso.sls b/sift/packages/python3-plaso.sls
index 8d97702..e5243b1 100644
--- a/sift/packages/python3-plaso.sls
+++ b/sift/packages/python3-plaso.sls
@@ -1,7 +1,6 @@
 include:
   - sift.repos.sift
   - sift.repos.gift
-  - sift.packages.absent.plaso
   - sift.packages.python3
   - sift.packages.python3-xlsxwriter
   - sift.packages.python3-dfvfs
@@ -16,7 +15,6 @@ sift-package-python3-plaso:
     - update_holds: True
     - allow_updates: True
     - require:
-      - sls: sift.packages.absent.plaso
       - sls: sift.repos.sift
       - sls: sift.repos.gift
       - sls: sift.packages.python3
diff --git a/sift/packages/python3-pyqt5.sls b/sift/packages/python3-pyqt5.sls
index c528022..a675ee6 100644
--- a/sift/packages/python3-pyqt5.sls
+++ b/sift/packages/python3-pyqt5.sls
@@ -1,8 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'bionic': 'python3-pyqt4',
-  'focal': 'python3-pyqt5'
-}, grain='oscodename') %}
-
 sift-package-python-pyqt:
   pkg.installed:
-    - name: {{ package_name }}
\ No newline at end of file
+    - name: python3-pyqt5
diff --git a/sift/packages/python3-xlsxwriter.sls b/sift/packages/python3-xlsxwriter.sls
index 918919f..23e7bb4 100644
--- a/sift/packages/python3-xlsxwriter.sls
+++ b/sift/packages/python3-xlsxwriter.sls
@@ -1,15 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'xenial': 'python-xlsxwriter',
-  'bionic': 'python-xlsxwriter',
-  'focal': 'python3-xlsxwriter'
-}, grain='oscodename') %}
-
-{% if grains['oscodename'] != 'focal' %}
-sift-python3-xlsxwriter:
-  pkg.removed:
-    - name: python3-xlsxwriter
-{% endif %}
-
 sift-python-xlsxwriter:
   pkg.installed:
-    - name: {{ package_name }}
+    - name: python3-xlsxwriter
diff --git a/sift/packages/samdump2.sls b/sift/packages/samdump2.sls
index bd67075..787fecc 100644
--- a/sift/packages/samdump2.sls
+++ b/sift/packages/samdump2.sls
@@ -1,8 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'bionic': 'bkhive',
-  'focal': 'samdump2'
-}, grain='oscodename') %}
-
 sift-package-samdump2:
   pkg.installed:
-    - name: {{ package_name }}
\ No newline at end of file
+    - name: samdump2
diff --git a/sift/packages/software-properties-common.sls b/sift/packages/software-properties-common.sls
index 3568aeb..f53051f 100644
--- a/sift/packages/software-properties-common.sls
+++ b/sift/packages/software-properties-common.sls
@@ -1,9 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'xenial': 'python-software-properties',
-  'bionic': 'software-properties-common',
-  'focal':  'software-properties-common',
-}, grain='oscodename') %}
-
 sift-package-software-properties-common:
   pkg.installed:
-    - name: {{ package_name }}
+    - name: software-properties-common
diff --git a/sift/packages/system-config-samba.sls b/sift/packages/system-config-samba.sls
deleted file mode 100644
index 13d95f7..0000000
--- a/sift/packages/system-config-samba.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-# system-config-samba was a GUI available in bionic and below for configuring samba
-{%- if grains['oscodename'] == "bionic" %}
-system-config-samba:
-  pkg.installed
-{%- else %}
-system-config-samba:
-  test.nop
-{%- endif %}
\ No newline at end of file
diff --git a/sift/packages/xpdf.sls b/sift/packages/xpdf.sls
deleted file mode 100644
index e4a092f..0000000
--- a/sift/packages/xpdf.sls
+++ /dev/null
@@ -1,10 +0,0 @@
-{%- if grains['oscodename'] == "bionic" %}
-sift-package-xpdf:
-  pkg.latest:
-    - name: xpdf
-{%- else %}
-sift-package-xdf:
-  test.nop
-{%- endif %}
-
-
diff --git a/sift/python-packages/appcompatprocessor.sls b/sift/python-packages/appcompatprocessor.sls
index 849fb37..b81a040 100644
--- a/sift/python-packages/appcompatprocessor.sls
+++ b/sift/python-packages/appcompatprocessor.sls
@@ -1,23 +1,5 @@
 {%- set commit="6c847937c5a836e2ce2fe2b915f213c345a3c389" -%}
 
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.packages.git
-  - sift.packages.python3-pip
-  - sift.packages.python2-pip
-  - sift.packages.libregf
-
-appcompatprocessor:
-  pip.installed:
-    - name: git+https://github.com/mbevilacqua/appcompatprocessor.git@{{ commit }}
-    - bin_env: /usr/bin/python2
-    - upgrade: True
-    - require:
-      - sls: sift.packages.git
-      - sls: sift.packages.python2-pip
-      - sls: sift.packages.libregf
-
-{%- elif grains['oscodename'] == "focal" %}
 include:
   - sift.packages.git
   - sift.packages.python3-pip
@@ -35,5 +17,3 @@ appcompatprocessor:
       - sls: sift.packages.python2-pip
       - sls: sift.packages.libregf
       - sls: sift.packages.python2-dev
-
-{%- endif %}
diff --git a/sift/python-packages/distorm3.sls b/sift/python-packages/distorm3.sls
index 75eaa8b..7a819d9 100644
--- a/sift/python-packages/distorm3.sls
+++ b/sift/python-packages/distorm3.sls
@@ -1,16 +1,3 @@
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.packages.python3-pip
-  - sift.packages.python2-pip
-
-sift-python-packages-distorm3:
-  pip.installed:
-    - name: distorm3 == 3.4.4
-    - bin_env: /usr/bin/python2
-    - require:
-      - sls: sift.packages.python2-pip
-
-{%- elif grains['oscodename'] == "focal" %}
 include:
   - sift.packages.python3-pip
   - sift.packages.python2-pip
@@ -23,5 +10,3 @@ sift-python-packages-distorm3:
     - require:
       - sls: sift.packages.python2-pip
       - sls: sift.packages.python2-dev
-
-{%- endif %}
diff --git a/sift/python-packages/m2crypto.sls b/sift/python-packages/m2crypto.sls
index af82724..3a7491b 100644
--- a/sift/python-packages/m2crypto.sls
+++ b/sift/python-packages/m2crypto.sls
@@ -1,21 +1,3 @@
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.packages.python3-pip
-  - sift.packages.python2-pip
-  - sift.packages.swig
-  - sift.packages.libssl-dev
-
-sift-python-packages-m2crypto:
-  pip.installed:
-    - name: m2crypto
-    - bin_env: /usr/bin/python2
-    - upgrade: True
-    - require:
-      - sls: sift.packages.python2-pip
-      - sls: sift.packages.swig
-      - sls: sift.packages.libssl-dev
-
-{%- elif grains['oscodename'] == "focal" %}
 include:
   - sift.packages.python3-pip
   - sift.packages.python2-pip
@@ -33,5 +15,3 @@ sift-python-packages-m2crypto:
       - sls: sift.packages.swig
       - sls: sift.packages.python2-dev
       - sls: sift.packages.libssl-dev
-
-{%- endif %}
diff --git a/sift/repos/init.sls b/sift/repos/init.sls
index 7bfd9af..6652224 100644
--- a/sift/repos/init.sls
+++ b/sift/repos/init.sls
@@ -2,7 +2,6 @@ include:
   - sift.repos.docker
   - sift.repos.gift
   - sift.repos.sift
-  - sift.repos.noobslab
   - sift.repos.openjdk
   - sift.repos.ubuntu-multiverse
   - sift.repos.ubuntu-universe
@@ -16,7 +15,6 @@ sift-repos:
       - sls: sift.repos.docker
       - sls: sift.repos.gift
       - sls: sift.repos.sift
-      - sls: sift.repos.noobslab
       - sls: sift.repos.openjdk
       - sls: sift.repos.ubuntu-multiverse
       - sls: sift.repos.ubuntu-universe
diff --git a/sift/repos/noobslab.sls b/sift/repos/noobslab.sls
deleted file mode 100644
index 409420c..0000000
--- a/sift/repos/noobslab.sls
+++ /dev/null
@@ -1,23 +0,0 @@
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.packages.software-properties-common
-  
-sift-repo-noobslab-themes:
-  pkgrepo.managed:
-    - name: noobslab-themes
-    - ppa: noobslab/themes
-    - refresh_db: true
-    - require:
-      - sls: sift.packages.software-properties-common
-
-sift-repo-noobslab-icons:
-  pkgrepo.managed:
-    - name: noobslab-icons
-    - ppa: noobslab/icons
-    - refresh_db: true
-    - require:
-      - sls: sift.packages.software-properties-common
-{%- else %}
-sift-repo-noobslab:
-  test.nop
-{%- endif %}
\ No newline at end of file
diff --git a/sift/tests/gift.sls b/sift/tests/gift.sls
index b9cc235..7000828 100644
--- a/sift/tests/gift.sls
+++ b/sift/tests/gift.sls
@@ -1,6 +1,5 @@
 include:
   - sift.repos.gift
-  - sift.packages.absent.plaso
   - sift.packages.autopsy
   - sift.packages.libbde
   - sift.packages.libbde-tools
@@ -30,7 +29,6 @@ sift-tests-gift:
     - name: test-gift
     - require:
         - sls: sift.repos.gift
-        - sls: sift.packages.absent.plaso
         - sls: sift.packages.autopsy
         - sls: sift.packages.libbde
         - sls: sift.packages.libbde-tools
diff --git a/sift/tests/libewf.sls b/sift/tests/libewf.sls
index d6fbdb9..31f2a8f 100644
--- a/sift/tests/libewf.sls
+++ b/sift/tests/libewf.sls
@@ -1,12 +1,11 @@
 include:
   - sift.repos.sift
   - sift.repos.gift
-  - sift.packages.absent.plaso
   - sift.packages.autopsy
   - sift.packages.libewf
   - sift.packages.python3
-  - sift.packages.python-xlsxwriter
-  - sift.packages.python-dfvfs
+  - sift.packages.python3-xlsxwriter
+  - sift.packages.python3-dfvfs
   - sift.packages.python3-plaso
   - sift.packages.sleuthkit
   - sift.packages.xmount
@@ -15,14 +14,13 @@ sift-tests-libewf:
   test.nop:
     - name: test-libewf
     - require:
-      - sls: sift.packages.absent.plaso
       - sls: sift.repos.sift
       - sls: sift.repos.gift
       - sls: sift.packages.autopsy
       - sls: sift.packages.libewf
       - sls: sift.packages.python3
-      - sls: sift.packages.python-xlsxwriter
-      - sls: sift.packages.python-dfvfs
+      - sls: sift.packages.python3-xlsxwriter
+      - sls: sift.packages.python3-dfvfs
       - sls: sift.packages.python3-plaso
       - sls: sift.packages.sleuthkit
       - sls: sift.packages.xmount