[Mason] Cleaned up SPMO + 3 sc.