+ Fixed an issue with the logic regarding the user preferences (they were always being preserved) + Restructured the removal functions to be a little more clear + A few other minor tweaks, including redirecting `ls` stderr to null