Remove zsh stuff and cleaning up