Refactor CA StateHandler to use message generator
Remove (only in CA) note