Clean up task ordering