4 files changed, 6 insertions, 14 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index c5a5a8e383..c255619299 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -1703,16 +1703,13 @@ void Acci::doThat() {
 		_vm->_scrolls->displayText("Vandalism is prohibited within this game!");
 		break;
 	case kVerbCodeQuit: // quit
-		if (_vm->_gyro->kDemo) {
-			warning("STUB: Acci::doThat() - case kVerbCodequit");
-		//	_vm->_visa->displayScrollChain('pos', 31);
-		//	close(demofile);
-		//	exit(0); // Change this later!!!
-		}
 		if (!_polite)
 			_vm->_scrolls->displayText("How about a `please\", Avvy?");
-		else if (_vm->_scrolls->displayQuestion(Common::String(Scrolls::kControlRegister) + 'C' + Scrolls::kControlIcon + "Do you really want to quit?"))
-			_vm->_gyro->_letMeOut = true;
+		else {
+			Common::String tmpStr = Common::String::format("%cC%cDo you really want to quit?", Scrolls::kControlRegister, Scrolls::kControlIcon);
+			if (_vm->_scrolls->displayQuestion(tmpStr))
+				_vm->_gyro->_letMeOut = true;
+		}
 		break;
 	case kVerbCodeGo:
 		_vm->_scrolls->displayText("Just use the arrow keys to walk there.");
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp
index 1b950739fd..17d21f4205 100644
--- a/engines/avalanche/gyro2.cpp
+++ b/engines/avalanche/gyro2.cpp
@@ -318,7 +318,6 @@ void Gyro::newGame() {
 	_vm->_animation->_sprites[0].init(0, true, _vm->_animation);
 
 	_alive = true;
-	_score = 0;
 	resetVariables();
 
 	_vm->_scrolls->setBubbleStateNatural();
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index 7581863dca..20e240af0b 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -215,7 +215,6 @@ public:
 	static const int16 kWalk = 3;
 	static const int16 kRun = 5;
 	static const int32 kCatacombMap[8][8];
-	static const bool kDemo = false; // If this is true, we're in a demo of the game.
 	static const char kSpludwicksOrder[3];
 	static const QuasipedType kQuasipeds[16];
 
@@ -319,7 +318,7 @@ public:
 	bool _weirdWord;
 	bool _letMeOut;
 	Common::String _scroll[15];
-	byte _scrollNum, _score, _whichwas;
+	byte _scrollNum, _whichwas;
 	byte _thinks;
 	bool _thinkThing;
 	int16 _talkX, _talkY;
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 9a7d048763..76329e3118 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -918,9 +918,6 @@ void Lucerna::drawToolbar() {
 }
 
 void Lucerna::drawScore() {
-	if (_vm->_gyro->kDemo)
-		return;
-
 	uint16 score = _vm->_gyro->_dnascore;
 	int8 numbers[3] = {0, 0, 0};
 	for (byte i = 0; i < 2; i++) {