Remove debug code
Remove debug code
Minor scoreboard improvements