Revert "Add basic state and context structure"

This reverts commit 8324822ff0a2fe44ff7a331de8be5190407add93.
Add basic state and context structure