- Some unused codes are removed.
- refactoring continued.