Simplify task group (#451)