- some clean up
- reorganization of sync between view and model
- delete unneeded trash