Clean up assignments