Remove the old CONTAINER values from pbi.conf, also cleanup xdg-*/
directories, remove ones which are empty