added more tmp file cleanup