Removed some old stuff, simplified PS1 (and removed git status).