2032: refactor

1. refactor, remove some code
2. not complete