Remove obsolete TODO.
Merge pull request #136 from pleroy/Cleanup

Remove obsolete TODO.
Merge remote-tracking branch 'la-vache/master'