Better handling of deleted files