smp: add rest of cleanup commit