Revert "Use state instances in MetaState implementations"

This reverts commit 8399118ab6ea110393198919dcc45ea7908f947d.
Don't test pickle for now