- Updated TODO
- Removed unused variables