Ensure that the full timeshift file is copied

And cleanup/simplify some code