Begin cleanup - remove unused stuff from driver