diff --git a/rc/profile b/rc/profile
index b05abb38..14491d48 100644
--- a/rc/profile
+++ b/rc/profile
@@ -1,4 +1,26 @@
-#if [ -f ~/.$(echo $SHELL|cut -d/ -f3)rc ] && [ x$DISPLAY != x ]; then
-#    source ~/.$(echo $SHELL|cut -d/ -f3)rc
-#fi
+# Set PATH properly
+PATH=$HOME/.local/bin:$HOME/.local/sbin:$HOME/.local/games:$HOME/.linuxbrew/bin:$HOME/.linuxbrew/sbin:$HOME/.linuxbrew/games:$HOME/bin:$HOME/sbin:$HOME/games:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
+
+# Add RubyGems to PATH
+if hash ruby 2>/dev/null; then
+    PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
+fi
+
+# Set compose to left Super/Windows, kill X with ctrl-alt-backspace,
+# disable nbsp (still available with compose-space-space.
 setxkbmap -option compose:lwin -option terminate:ctrl_alt_bksp -option nbsp:none
+
+# Removes duplicates from $PATH. Copied from http://unix.stackexchange.com/a/14896
+PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
+
+# Start gpg-agent
+eval $(gpg-agent --daemon)
+
+# Enable core files.
+ulimit -c unlimited
+
+
+# The environment was set to ~/.environment according to other files...
+if [ -f ~/.environment ]; then
+    . ~/.environment
+fi
diff --git a/rc/xsessionrc b/rc/xsessionrc
deleted file mode 100644
index e734c9ff..00000000
--- a/rc/xsessionrc
+++ /dev/null
@@ -1,37 +0,0 @@
-PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$HOME/.local/bin:$HOME/.local/sbin:$HOME/.local/games:$HOME/bin:$HOME/sbin:$HOME/games:$HOME/tmcbeans/bin:/opt/local/bin:/opt/local/sbin:/opt/local/games:/usr/local/bin:/usr/local/sbin:/usr/local/games:/bin:/sbin:/games:/usr/bin:/usr/sbin:/usr/games:$PATH
-
-# Sets environment variable CPUARCH to output of "uname -p" & UNAME to "uname"
-UNAME=$(uname)
-CPUARCH=$(uname -p)
-
-# Use gpg-agent
-eval $(gpg-agent --daemon)
-
-# For MonkeySphere
-mkdir -p ~/.monkeysphere
-echo "USE_VALIDATION_AGENT=true" > ~/.monkeysphere/monkeysphere.conf
-
-# Enable core files.
-ulimit -c unlimited
-
-# Start gtk-redshift automatically.
-# Use http://stereopsis.com/flux/map.html to get the coordinates. Replace ", " with ":".
-# Set the coordinates to file ~/.redshiftlocation in format redshiftlocation=60.4666227:26.9459998
-
-if [ -f ~/.redshiftlocation ]; then
-    . ~/.redshiftlocation ];
-fi
-
-gtk-redshift -l $redshiftlocation&
-
-# The environment was set to ~/.environment according to other files...
-if [ -f ~/.environment ]; then
-    . ~/.environment
-fi
-
-# Allow custom things to be put to ~/.xcustom
-if [ -f ~/.xcustom ]; then
-    . ~/.xcustom
-fi
-
-# vim: set ft=sh