Revert "Gamestate changes"

This reverts commit a06757eec80cba73afee1bd1f86cb73d91a7271c.