[MP] Remove leftover SMP remnants.
[SP] Remove leftover SMP remnants.