- TODOs updated.
- unnecessary codes have been removed.