Simplify task graph
Test