erase useless if sentence
Merge branch 'hotfix-2233'