Remove useless else
Merge pull request #5826 from lucasmichot/5.0-support-useless-else

[5.0] Foundation : remove useless else