Cleanup more cli leftovers Upstream-commit: 4bdb6ed9b58d641176a601cfe92d496038c5a557 Component: engine