Sync:
- Apply feature "Phan Bien"
- Delete unused files