Remove more debugging code related to new scoreboard