Clean some code

latest commit 909f58f159
Saunier Thibault authored