Some redundant lines in del-tmp-files removed.
Doubled code in del-tmp-files removed