Driver structure cleanup