diff --git a/PepDev32/pepsources/peppermint.list b/PepDev32/pepsources/peppermint.list
index abf8a39..ec352b2 100644
--- a/PepDev32/pepsources/peppermint.list
+++ b/PepDev32/pepsources/peppermint.list
@@ -1,9 +1,3 @@
 #Main repos
-#deb http://repo.peppermintos.com/packages peppermint main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
-
-#Testing repos
 deb http://repo.peppermintos.com/packages daedalus main contrib non-free non-free-firmware
 #deb-src http://repo.peppermintos.com/packages daedalus main contrib non-free non-free-firmware
-
-
diff --git a/PepDev64/pepsources/peppermint.list b/PepDev64/pepsources/peppermint.list
index abf8a39..ec352b2 100644
--- a/PepDev64/pepsources/peppermint.list
+++ b/PepDev64/pepsources/peppermint.list
@@ -1,9 +1,3 @@
 #Main repos
-#deb http://repo.peppermintos.com/packages peppermint main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
-
-#Testing repos
 deb http://repo.peppermintos.com/packages daedalus main contrib non-free non-free-firmware
 #deb-src http://repo.peppermintos.com/packages daedalus main contrib non-free non-free-firmware
-
-
diff --git a/PepDev_arm64/pepsources/peppermint.list b/PepDev_arm64/pepsources/peppermint.list
index abf8a39..ec352b2 100644
--- a/PepDev_arm64/pepsources/peppermint.list
+++ b/PepDev_arm64/pepsources/peppermint.list
@@ -1,9 +1,3 @@
 #Main repos
-#deb http://repo.peppermintos.com/packages peppermint main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
-
-#Testing repos
 deb http://repo.peppermintos.com/packages daedalus main contrib non-free non-free-firmware
 #deb-src http://repo.peppermintos.com/packages daedalus main contrib non-free non-free-firmware
-
-
diff --git a/pepscripts/07final-cleanup b/pepscripts/07final-cleanup
index cb95100..921b919 100755
--- a/pepscripts/07final-cleanup
+++ b/pepscripts/07final-cleanup
@@ -17,9 +17,7 @@ chroot /target apt purge --autoremove -y \
     connman \
     deluge \
     galculator \
-    raspi-firmware \
     imagemagick \
-    imagemagick-6-common
+    imagemagick-6-common \
+    xterm
 
-# Clean unnecessary files
-rm -r /target/boot/firmware
diff --git a/pepscriptsdev/06setup-snap-install b/pepscriptsdev/06setup-snap-install
deleted file mode 100755
index 7a12973..0000000
--- a/pepscriptsdev/06setup-snap-install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
-
-# This script copies a file to the chroot and runs commands during the Debian installation process.
-
-# Workaround for using snapd on debian.  Thank You - @stevesveryown and peppermint team..
-cd /target
-[ ! -e /etc/skel/.local/share ] && mkdir -p /etc/skel/.local/share
-[ ! -e /var/lib/snapd/desktop/applications ] &&
-mkdir -p /var/lib/snapd/desktop/applications &&
-chmod 777 /var/lib/snapd/desktop/applications
-ln -s /var/lib/snapd/desktop/applications /etc/skel/.local/share/applications
-ln -s snap /usr/bin/snap-store
-
-
diff --git a/pepscriptsdev/07final-cleanup b/pepscriptsdev/07final-cleanup
index cb95100..721019e 100755
--- a/pepscriptsdev/07final-cleanup
+++ b/pepscriptsdev/07final-cleanup
@@ -19,7 +19,5 @@ chroot /target apt purge --autoremove -y \
     galculator \
     raspi-firmware \
     imagemagick \
-    imagemagick-6-common
-
-# Clean unnecessary files
-rm -r /target/boot/firmware
+    imagemagick-6-common \
+    xterm
diff --git a/pepsources/peppermint.list b/pepsources/peppermint.list
index 0482718..8307656 100644
--- a/pepsources/peppermint.list
+++ b/pepsources/peppermint.list
@@ -1,9 +1,3 @@
 #Main repos
-#deb http://repo.peppermintos.com/packages peppermint main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
-
-#Testing repos
 deb http://repo.peppermintos.com/packages bookworm main contrib non-free non-free-firmware
 #deb-src http://repo.peppermintos.com/packages bookworm main contrib non-free non-free-firmware
-
-
diff --git a/pepsources/sources.list b/pepsources/sources.list
index 141431f..0f31497 100644
--- a/pepsources/sources.list
+++ b/pepsources/sources.list
@@ -13,8 +13,8 @@ deb http://security.debian.org/ bookworm-security main contrib non-free non-free
 deb-src http://security.debian.org/ bookworm-security main contrib non-free non-free-firmware
 
 # Updates Repo - main contrib non-free
-deb http://deb.debian.org/debian bookworm-updates main contrib non-freenon-free-firmware
-deb-src http://deb.debian.org/debian bookworm-updates main non-free-firmware
+deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian bookworm-updates main  contrib non-free non-free-firmware
 
 # bookworm-backports, previously on backports.debian.org
 deb http://deb.debian.org/debian/ bookworm-backports main contrib non-free non-free-firmware