Simplify more drivers