Cleanup some statements from exec driver work Upstream-commit: a7ecc3ea119857593186025ce7268db4c0cbb18c Component: engine