Simplify the driver

Cut redundant code in drivers.