TTT: Clean up around new scoreboard hooks