- Code cleanup part 3
- Use the driver everywhere