Removed dead code
Julien suggestion added