code cleanup

- remove duplicate code
- build v0.0.12