diff --git a/src/drivers/win/input.cpp b/src/drivers/win/input.cpp
index e4bcbfe8..6885917e 100644
--- a/src/drivers/win/input.cpp
+++ b/src/drivers/win/input.cpp
@@ -323,15 +323,10 @@ void FCEUD_UpdateInput()
 	bool joy=false,mouse=false;
 	EMOVIEMODE FCEUMOVState = FCEUMOV_Mode();
 
-	extern bool justloadedstate;
-	if(((FCEUMOVState != MOVIEMODE_PLAY) && (FCEUMOVState != MOVIEMODE_RECORD)) || !justloadedstate) {
 	KeyboardUpdateState();
 	UpdateJoysticks();
 
 	HandleHotkeys();
-	}
-	justloadedstate = false;
-	
 
 	{
 		for(int x=0;x<2;x++)
diff --git a/src/fceu.cpp b/src/fceu.cpp
index 7519e326..7810cc68 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -81,7 +81,6 @@ bool justLagged = false;
 bool frameAdvanceLagSkip = false; //If this is true, frame advance will skip over lag frame (i.e. it will emulate 2 frames instead of 1)
 bool AutoSS = false;		//Flagged true when the first auto-savestate is made while a game is loaded, flagged false on game close
 bool movieSubtitles = true; //Toggle for displaying movie subtitles
-bool justloadedstate = false;
 
 FCEUGI::FCEUGI()
 : filename(0)
diff --git a/src/lua-engine.cpp b/src/lua-engine.cpp
index 44841bca..b9a4673d 100644
--- a/src/lua-engine.cpp
+++ b/src/lua-engine.cpp
@@ -2116,8 +2116,8 @@ static int joy_get_internal(lua_State *L, bool reportUp, bool reportDown) {
 	}
 	
 	// Use the OS-specific code to do the reading.
-	extern void FCEUD_UpdateInput(void);
-	FCEUD_UpdateInput();
+	/*extern void FCEUD_UpdateInput(void);	FatRatKnight: What's this call doing here?
+	FCEUD_UpdateInput();					I commented it out. Should we delete it?*/
 	extern SFORMAT FCEUCTRL_STATEINFO[];
 	uint8 buttons = ((uint8 *) FCEUCTRL_STATEINFO[1].v)[which - 1];