Now using zsh, some cleanup