Remove SaveStateMode

Fixes #2340