Clean up task fixes