DAGBuilder fixed (clean-up required)
DAGBuilder cleaned (more needed)