Clean up scoreboard class