More zsh cleanup