state machine, scoreboard API usage, remove redundant classes covered by scoreboard API