clean up

- remove unused struct member
- remove redundant func and func call