I see - so then isn't this even simpler. We just add a message to clean up the ShuffleId once the shuffle dependency goes out of scope?