Revert "Saved State"

This reverts commit ece83eed749faab6c131238a7ab1852f307c5958.