Cleanups in anticipation of Ethernet driver integration