Revert "Added SPB back"

This reverts commit 91633e57049cf0b21e9b7dffc877e7e0390ea769.