[Fix] workaround for non-deleted files and remove last fix #56