Code clean up

- Remove unused dependencies
- Reformat comment