Don't delete moved files if not empty (some files skipped during merge).
Code clean-up.