misc drivers: Moved functions into driver class, cleanups (nw)