Remove unused variables
Set PROMPT_COMMAND again
Add missing files