Revert "schema updates and persistence"

This reverts commit 62bde0b860b1ed742eea4fbf5e45a7618a8373fb.