Removing PROMPT_COMMAND and moving that stuff into PS1