-SMP

Removed SMP routines
Merge remote-tracking branch 'upstream/master'