torture: Fix cleanup2 to utilize on-demand cleanup