ZSHRC cleanup