diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index 35aa17956..85c77fd17 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -823,8 +823,9 @@ static void gameTicker()
     else
     {
         netCheckSync();
+		auto beforeSwapTime = I_msTimeF();
         viewDrawScreen();
-        g_gameUpdateAndDrawTime = g_beforeSwapTime/* I_msTimeF()*/ - gameUpdateStartTime;
+        g_gameUpdateAndDrawTime = beforeSwapTime/* I_msTimeF()*/ - gameUpdateStartTime;
     }
 }
 
diff --git a/source/build/include/baselayer.h b/source/build/include/baselayer.h
index 5cd62e6fb..ec8ff74ee 100644
--- a/source/build/include/baselayer.h
+++ b/source/build/include/baselayer.h
@@ -15,27 +15,12 @@
 #include "zstring.h"
 #include "vectors.h"
 
-extern int32_t swapcomplete;
-
 EXTERN_CVAR(Bool, r_usenewaspect)
 
 // video
 extern int32_t newaspect_enable;
-extern int32_t r_fpgrouscan;
-extern int32_t setaspect_new_use_dimen;
-extern int32_t xres, yres, bpp;
 
-int32_t videoCheckMode(int32_t *x, int32_t *y, int32_t c, int32_t fs, int32_t forced);
-int32_t videoSetMode(int32_t x, int32_t y, int32_t c, int32_t fs);
-void    videoGetModes(void);
 void    videoShowFrame(int32_t);
-int32_t videoUpdatePalette(int32_t start, int32_t num);
-
-extern int32_t qsetmode;
-
-#define in3dmode() (qsetmode==200)
-
-extern int32_t g_logFlushWindow;
 
 #include "gamestruct.h"
 #endif // baselayer_h_
diff --git a/source/build/include/build.h b/source/build/include/build.h
index 12857cb38..172874b1b 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -646,7 +646,6 @@ void vox_undefine(int32_t const);
 void vox_deinit();
 
 int32_t   videoSetGameMode(char davidoption, int32_t daupscaledxdim, int32_t daupscaledydim, int32_t dabpp, int32_t daupscalefactor);
-void   videoNextPage(void);
 void   videoSetCorrectedAspect();
 void   videoSetViewableArea(int32_t x1, int32_t y1, int32_t x2, int32_t y2);
 void   renderSetAspect(int32_t daxrange, int32_t daaspect);
diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp
index 42ce85175..a6b24995b 100644
--- a/source/build/src/engine.cpp
+++ b/source/build/src/engine.cpp
@@ -83,7 +83,6 @@ static int32_t oxdimen = -1, oviewingrange = -1, oxyaspect = -1;
 CVAR(Bool, r_usenewaspect, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 int32_t newaspect_enable=0;
 
-int32_t r_fpgrouscan = 1;
 int32_t globalflags;
 
 static int8_t tempbuf[MAXWALLS];
@@ -350,7 +349,6 @@ int16_t globalpicnum;
 static int32_t globaly1, globalx2;
 
 int16_t sectorborder[256];
-int32_t ydim16, qsetmode = 0;
 int16_t pointhighlight=-1, linehighlight=-1, highlightcnt=0;
 
 int32_t halfxdim16, midydim16;
@@ -2681,15 +2679,9 @@ int32_t videoSetGameMode(char davidoption, int32_t daupscaledxdim, int32_t daups
     daupscaledxdim = max(320, daupscaledxdim);
     daupscaledydim = max(200, daupscaledydim);
 
-    if (in3dmode() && 
-        (xres == daupscaledxdim) && (yres == daupscaledydim) && (bpp == dabpp))
-        return 0;
-
     Bstrcpy(kensmessage,"!!!! BUILD engine&tools programmed by Ken Silverman of E.G. RI."
            "  (c) Copyright 1995 Ken Silverman.  Summary:  BUILD = Ken. !!!!");
 
-    j = bpp;
-
     rendmode = REND_POLYMOST;
 
     upscalefactor = 1;
@@ -2713,26 +2705,9 @@ int32_t videoSetGameMode(char davidoption, int32_t daupscaledxdim, int32_t daups
 
     if (searchx < 0) { searchx = halfxdimen; searchy = (ydimen>>1); }
 
-    qsetmode = 200;
     return 0;
 }
 
-//
-// nextpage
-//
-void videoNextPage(void)
-{
- 	g_beforeSwapTime = I_msTimeF();
-	videoShowFrame(0);
-
-    omdtims = mdtims;
-    mdtims = I_msTime();
-
-    for (native_t i = 0; i < MAXSPRITES + MAXUNIQHUDID; ++i)
-        if ((mdpause && spriteext[i].mdanimtims) || (spriteext[i].flags & SPREXT_NOMDANIM))
-            spriteext[i].mdanimtims += mdtims - omdtims;
-}
-
 //
 // qloadkvx
 //
@@ -3718,8 +3693,6 @@ void rotatepoint(vec2_t const pivot, vec2_t p, int16_t const daang, vec2_t * con
     p2->y = dmulscale14(p.y, dacos, p.x, dasin) + pivot.y;
 }
 
-int32_t setaspect_new_use_dimen = 0;
-
 void videoSetCorrectedAspect()
 {
     if (/*r_usenewaspect &&*/ newaspect_enable && videoGetRenderMode() != REND_POLYMER)
@@ -3730,11 +3703,8 @@ void videoSetCorrectedAspect()
         int32_t yx = (65536 * 5) / 4;
         int32_t vr, y, x;
 
-        const int32_t xd = setaspect_new_use_dimen ? xdimen : xdim;
-        const int32_t yd = setaspect_new_use_dimen ? ydimen : ydim;
-
-        x = xd;
-        y = yd;
+        x = xdim;
+        y = ydim;
 
         vr = divscale16(x*3, y*4);
 
diff --git a/source/build/src/engine_priv.h b/source/build/src/engine_priv.h
index ffcdeea54..a72f8b50f 100644
--- a/source/build/src/engine_priv.h
+++ b/source/build/src/engine_priv.h
@@ -109,7 +109,6 @@ extern int16_t searchbottomwall, searchisbottom;
 extern char inpreparemirror;
 
 extern int16_t sectorborder[256];
-extern int32_t qsetmode;
 extern int32_t hitallsprites;
 
 extern int32_t xb1[MAXWALLSB];
diff --git a/source/build/src/mdsprite.cpp b/source/build/src/mdsprite.cpp
index 4b34165f0..6e4cbb921 100644
--- a/source/build/src/mdsprite.cpp
+++ b/source/build/src/mdsprite.cpp
@@ -1677,6 +1677,16 @@ static void mdfree(mdmodel_t *vm)
     if (vm->mdnum == 2 || vm->mdnum == 3) { md3free((md3model_t *)vm); return; }
 }
 
+static void updateModelInterpolation()
+{
+	// sigh...
+	omdtims = mdtims;
+	mdtims = I_msTime();
+	
+	for (native_t i = 0; i < MAXSPRITES + MAXUNIQHUDID; ++i)
+		if ((mdpause && spriteext[i].mdanimtims) || (spriteext[i].flags & SPREXT_NOMDANIM))
+			spriteext[i].mdanimtims += mdtims - omdtims;
+}
 #endif
 
 //---------------------------------------- MD LIBRARY ENDS  ----------------------------------------
diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
index 2f53733b4..c1605d4ab 100644
--- a/source/core/gamecontrol.cpp
+++ b/source/core/gamecontrol.cpp
@@ -91,11 +91,9 @@ CUSTOM_CVAR(Int, mouse_capturemode, 1, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
 }
 
 // The last remains of sdlayer.cpp
-double g_beforeSwapTime;
 GameInterface* gi;
 int myconnectindex, numplayers;
 int connecthead, connectpoint2[MAXMULTIPLAYERS];
-int32_t xres = -1, yres = -1, bpp = 0;
 auto vsnprintfptr = vsnprintf;	// This is an inline in Visual Studio but we need an address for it to satisfy the MinGW compiled libraries.
 int gameclock;
 int lastTic;
@@ -938,10 +936,10 @@ void app_loop()
 	{
 		try
 		{
+			I_SetFrameTime();
 			TickSubsystems();
 			twod->SetSize(screen->GetWidth(), screen->GetHeight());
 			twodpsp.SetSize(screen->GetWidth(), screen->GetHeight());
-			I_SetFrameTime();
 
 			handleevents();
 			updatePauseStatus();
@@ -962,7 +960,7 @@ void app_loop()
 			soundEngine->UpdateSounds(I_GetTime());
 			Mus_UpdateMusic();		// must be at the end.
 
-			videoNextPage();
+			videoShowFrame(0);
 			videoSetBrightness(0);	// immediately reset this so that the value doesn't stick around in the backend.
 		}
 		catch (CRecoverableError& err)
diff --git a/source/core/gamestruct.h b/source/core/gamestruct.h
index 506cfd8e5..7ae7977b7 100644
--- a/source/core/gamestruct.h
+++ b/source/core/gamestruct.h
@@ -96,7 +96,6 @@ struct GameInterface
 };
 
 extern GameInterface* gi;
-extern double g_beforeSwapTime;
 
 
 void ImGui_Begin_Frame();
diff --git a/source/exhumed/src/view.cpp b/source/exhumed/src/view.cpp
index 246bed98b..91b45676e 100644
--- a/source/exhumed/src/view.cpp
+++ b/source/exhumed/src/view.cpp
@@ -222,9 +222,7 @@ static void analyzesprites()
 
 void ResetView()
 {
-    //videoSetGameMode(gSetup.fullscreen, gSetup.xdim, gSetup.ydim, gSetup.bpp, 0);
     EraseScreen(overscanindex);
-    //videoUpdatePalette(0, 256);
 #ifdef USE_OPENGL
     videoTintBlood(0, 0, 0);
 #endif