- 3.0-rc3
- code cleanup