diff --git a/engines/saga2/input.cpp b/engines/saga2/input.cpp
deleted file mode 100644
index f9939c6ff3b..00000000000
--- a/engines/saga2/input.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *
- * Based on the original sources
- *   Faery Tale II -- The Halls of the Dead
- *   (c) 1993-1996 The Wyrmkeep Entertainment Co.
- */
-
-#include "saga2/std.h"
-#include "saga2/input.h"
-
-namespace Saga2 {
-
-void InitMouse(int16 width, int16 height) {
-	warning("STUB: InitMouse()");
-}
-
-void CleanupMouse(void) {
-	warning("STUB: CleanupMouse()");
-}
-
-gTimeStamp ReadTimer() {
-	warning("STUB: ReadTimer()");
-	return 0;
-}
-
-bool ReadKeyboard(int &key, int &qual) {
-	warning("STUB: ReadKeyboard()");
-	return false;
-}
-
-} // end of namespace Saga2
diff --git a/engines/saga2/input.h b/engines/saga2/input.h
index 949c4307056..e0f39840783 100644
--- a/engines/saga2/input.h
+++ b/engines/saga2/input.h
@@ -117,7 +117,6 @@ void CleanupMouse(void);
 void ReadMouse(gMouseState &st);
 uint16 ReadQualifiers(void);
 bool ReadKeyboard(int &key, int &qual);
-gTimeStamp ReadTimer(void);
 bool DoubleClick(gTimeStamp oldTime);
 
 } // end of namespace Saga2
diff --git a/engines/saga2/panel.cpp b/engines/saga2/panel.cpp
index fff13560c1f..4bb91243dd8 100644
--- a/engines/saga2/panel.cpp
+++ b/engines/saga2/panel.cpp
@@ -922,8 +922,7 @@ void gToolBase::handleMouse(Common::Event &event, uint32 time) {
 			//  1/3 of a second, and that the mouse ptr hasn't moved
 			//  very much.
 
-			if (((uint32)(msg.timeStamp - lastClickTime)
-			        < (ticksPerSecond * 2 / 3))
+			if (((uint32)(msg.timeStamp - lastClickTime) < 333)
 			        ||  _curMouseState.left > 1
 			        ||  _curMouseState.right > 1) {
 				Point16 diff = lastClickPos - _curMouseState.pos;
@@ -978,7 +977,7 @@ void gToolBase::handleMouse(Common::Event &event, uint32 time) {
 }
 
 void gToolBase::leavePanel(void) {
-	msg.timeStamp = ReadTimer();
+	msg.timeStamp = g_system->getMillis();
 
 	if (mousePanel) {
 		msg.inPanel     = 0;
@@ -1013,7 +1012,7 @@ void gToolBase::handleKeyStroke(Common::Event &event) {
 	msg.pointerLeave = 0;
 	msg.key = ((key & 0xFF) != 0) ? key & 0xff : (key >> 8) + 0x80;
 	msg.qualifier = qualifier;
-	msg.timeStamp = ReadTimer();
+	msg.timeStamp = g_system->getMillis();
 
 	if (activePanel) {                      // send keystroke to active panel
 		setMsg(msg, activePanel);            // set up gPanelMessage
@@ -1067,7 +1066,7 @@ void gToolBase::handleTimerTick(int32 tick) {
 			setMsg(msg, mousePanel);         // set up gPanelMessage
 			mousePanel->pointerMove(msg);
 		} else if (!mouseHintSet
-		           && ((uint32)(tick - lastMouseMoveTime) > ticksPerSecond / 2)) {
+		           && ((uint32)(tick - lastMouseMoveTime) > 500)) {
 			mousePanel->onMouseHintDelay();
 		}
 	}
diff --git a/engines/saga2/panel.h b/engines/saga2/panel.h
index 9967c132d25..ad0867d131c 100644
--- a/engines/saga2/panel.h
+++ b/engines/saga2/panel.h
@@ -237,7 +237,7 @@ public:
 	uint16          key,                    // keystroke from keyboard
 	                qualifier;              // qualifier from keyboard
 
-	int32           timeStamp;              // time of message
+	uint32          timeStamp;              // time of message
 };
 
 /* ===================================================================== *