Task updates & cleanup