More cleanup of zshrc