Remove temporaries during scan (fixes #1092)
Merge pull request #1107 from AudriusButkevicius/cleanup

Remove temporaries during scan (fixes #1092)