Fix cleanup

[tamslo]

• Cleanup of folder fails wrongly because of non-matching file size
• Cleanup attempted although check before fails (although wrongly)