Revert "Fixed Scoring.*pp"

This reverts commit 73ca8514fa14a3beea705346e8ec6a3128079c58.