Revert "Changes to the State Module"

This reverts commit 64f1a963ae53da53e2486c3339378cb26f29e827.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
#   (use "git pull" to update your local branch)
#