Moved State init and unint to constructor and deconstructor.
Removed commented not needed line.