Removed running_machine parameter from various methods were it wasn't needed anymore (nw)
Moved some more functions into driver classes. (nw)