drivers: cpuilde: cleanup from merge