- Removed unused include.
- Removed TODO.