fixes(verifyState) - Make sure we verify our state

* guid generation
Merge pull request #321 from racker/fixes/too_liberal_with_code_removal

fixes(verifyState) - Make sure we verify our state