Remove dead code.
Cleanup a few TODOs.