CFY-1046 simplify execute-workflow