Main zsh and oh-my-zsh config cleanup