Revert "Added More Scoreboard Implementation"

This reverts commit 3113708860204f7795fb87dfc3464389648c1d5a.