Refine state

Ironically, comment was already correct but not the code
Remove for now the checkState

Will see is it needed in there, and than to solve
events differently.