Revert "GameState error fixes"

This reverts commit f22f95ec06f233da1b64d827782c9ec7e974098f.