* Removed redundant code.
* State spec was broken.