diff --git a/xsession b/xsession
index 78fa312..d407c1f 100644
--- a/xsession
+++ b/xsession
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# Setup PATH
-export PATH=$HOME/bin:/sbin:/usr/local/sbin:/usr/sbin:/bin:/usr/local/bin:/usr/bin:/usr/local/games:/usr/games
-
 # Setup locale
 export LANG=fr_FR.utf8
 export LC_MESSAGES=en_US.utf8
@@ -16,15 +13,11 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 # We do not want to rely on crappy mailcap
 export MAILCAPS=$HOME/.mailcap
 
-# Workaround a bug in XI focus-in events. See:
-#  https://bugzilla.gnome.org/show_bug.cgi?id=677329
-export GDK_CORE_DEVICE_EVENTS=1
-
 # Make QT automatically scale according to screen DPI
 export QT_AUTO_SCREEN_SCALE_FACTOR=1
 
 # Environment variables
-[ -e ~/.zsh/env ] && . ~/.zsh/env
+[ -e ~/.zshenv ] && . ~/.zshenv
 
 # GDM move Xauthority in some obscure place
 # See: