Remove useless define
Improve State System