-if dpkg --list | grep bluez-gstreamer 1> /dev/null 2>&1; then
- ${APT} remove --purge bluetooth bluez bluez-gstreamer bluez-alsa bluez-cups
+if dpkg --list | grep "openoffice" 1> /dev/null 2>&1; then
+ ${APT} remove --purge openoffice*
+fi
+
+if dpkg --list | grep "samba-common" 1> /dev/null 2>&1; then
+ ${APT} remove --purge samba-common
+fi
+
+if dpkg --list | grep "evolution-exchange" 1> /dev/null 2>&1; then
+ ${APT} remove --purge evolution
+fi
+
+if dpkg --list | grep "pppconfig" 1> /dev/null 2>&1; then
+ ${APT} remove --purge pppconfig pppoeconf
+fi
+
+if dpkg --list | grep "totem-common" 1> /dev/null 2>&1; then
+ ${APT} remove --purge totem totem-common
+fi
+
+if dpkg --list | grep "gwibber" 1> /dev/null 2>&1; then
+ ${APT} remove --purge gwibber gwibber-service
+fi
+
+# Remove proprietary code/drivers
+if dpkg --list | grep "nvidia" 1> /dev/null 2>&1; then
+ ${APT} remove --purge nvidia-*