diff --git a/base/home/local/.eshrc b/base/home/local/.eshrc
index f5589659..33c1fc80 100644
--- a/base/home/local/.eshrc
+++ b/base/home/local/.eshrc
@@ -5,5 +5,3 @@ export PS1_LEFT="${PS1_TITLE}\[\e[1m\e[38;5;221m\]\u\[\e[38;5;59m\]@\[\e[38;5;81
 if equals? "$TERM" "toaru-vga" then export RLINE_THEME="default" else export RLINE_THEME="sunsmoke"
 
 if stat -Lq /usr/local/bin then export PATH="/usr/local/bin:$PATH"
-if stat -Lq /usr/i686-pc-toaru/bin then export PATH="/usr/i686-pc-toaru/bin:$PATH"
-if stat -Lq /usr/share/python-demos then export PATH="/usr/share/python-demos:$PATH"
diff --git a/base/home/local/.yutanirc b/base/home/local/.yutanirc
index c3b1b0d2..c7264204 100755
--- a/base/home/local/.yutanirc
+++ b/base/home/local/.yutanirc
@@ -1,10 +1,18 @@
 #!/bin/sh
 
-if stat -Lq /usr/share/fonts/DejaVuSansMono.ttf then export FREETYPE_PROPERTIES="truetype:interpreter-version=35"
+# Start wallpaper
 cd ~/Desktop
 file-browser --wallpaper &
-toastd --really # Daemonizes
 cd ~
+
+# Start toast daemon
+toastd --really # Daemonizes
+
+# If we haven't shown the tutorial yet, show it.
 if not stat -q ~/.tutorial-shown then show-tutorial.sh
+
+# Login toast notifications
 show-toasts.krk &
+
+# Replace us with the panel
 exec panel --really