erase useless State class
Merge branch 'hotfix-2549'