Remove unnecessary code.
Merge pull request #449 from cpoulain/master

Remove unnecessary code.