Getting rid of some references to legacy_cpu_device (nw)