diff --git a/etc/.profile b/etc/.profile
index 3c0f822..01f8125 100644
--- a/etc/.profile
+++ b/etc/.profile
@@ -1,4 +1,4 @@
-export EDITOR='emacsclient --alternate-editor="" --tty'
+export EDITOR='emacs'
 export VISUAL=$EDITOR
 
 export WORKON_HOME=$HOME/.virtualenvs
diff --git a/zsh/.zprofile b/zsh/.zprofile
deleted file mode 100644
index 6bfcdf7..0000000
--- a/zsh/.zprofile
+++ /dev/null
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'
diff --git a/zsh/aliases b/zsh/aliases
index f92e604..ee0cc57 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -8,7 +8,6 @@ alias ll='ls -l'
 alias units='units --verbose'
 alias trr='transmission-remote'
 
-alias emacs='emacsclient --alternate-editor="" --tty'
 
 alias vol='pulseaudio-ctl set'