Fixed TODO tasks.

Uncommented bad code.