- UI changes.
- Removing some unused classes.