v0.21 Partial Cleaning

- Partial cleaning done
- DB property readfile bug