switch driver cleanup, 2nd phase