Remove unused scripts
Merge updated files from zsh branch