Revert "SPU Improvement"

This reverts commit 9bf8f2eec551b43ce5b433c7da70ae57d2305c4f.