- Code cleanup part 2
- Use own driver backend part 1