Remove dead code
Merge pull request #591 from Aitboudad/master

Remove dead code