diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index e21d1e8..26c93e3 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,16 +1,13 @@
-# Lines configured by zsh-newuser-install
 HISTFILE=~/.histfile
 HISTSIZE=1000
 SAVEHIST=1000
 setopt appendhistory autocd autopushd extendedglob nohup nomatch histignorespace histlexwords histverify cbases
 unsetopt beep
 bindkey -e
-# End of lines configured by zsh-newuser-install
-# The following lines were added by compinstall
-zstyle :compinstall filename '/home/david/.zshrc'
 
+# Completion
+zstyle :compinstall filename '/home/david/.zshrc'
 autoload -Uz compinit && compinit
-# End of lines added by compinstall
 
 DIRSTACKSIZE=16
 case $TERM in
@@ -22,6 +19,7 @@ esac
 autoload -U colors && colors
 PS1="%{%(!.$fg[red].$fg[green])%}%n%{$fg[white]%}@%{$fg[cyan]%}%m%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[white]%}%#%{$reset_color%} "
 
+# .profile is universal
 . ~/.profile
 # Deduplicate the path
 typeset -U path
@@ -36,6 +34,8 @@ if [ -d $HOME/.oh-my-zsh ] ; then
   plugins=(git encode64 gpg-agent pep8 pip python tmux urltools extract sudo virsh virtualenv)
   source $ZSH/oh-my-zsh.sh
   unset ZSH_THEME
+  unset ZSH_CUSTOM
+  unset ZSH
 fi
 
 # Keybindings