Add in the CMTask, remove more dead code from DABuilder