Cleaned up TaskList old code