- sync with v1.1.0
- remove junk