cdc drivers: miscellaneous cleanup