Moves cleanup methods to driver class