Clean up shuffle.