Another set of changes to make the script clean up logs left aroung by prior
runs (skipped due to timeout waiting for close).