re #117 - change output message & check/safe remove files.