review comments
- remove unnecessary code