Fix "just in case" unlink. Prefer renaming of normal files