Remove nonsense branch logic
Merge pull request #4475 from tom--/remove-else-after-return

Remove nonsense branch logic