Fixed built by completing removal of state store code.

Expect to add this state store code back in at some point, but it hadn't
been tested in a while and added complexity/confusion.