Fixed TODOs
We delete the class Choice, it was useless.