clean some redundant else clauses Upstream-commit: 29595fd944012018706a22869f20adb233735baa Component: engine