- Match verbiage with other output - Remove dead code and clearer flow Signed-off-by: Richard Scothern <richard.scothern@gmail.com> Upstream-commit: e817e08481b91638037e55b8d4855f56814c81f5 Component: engine