diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp
index 261f7c7c2..6446f1149 100644
--- a/desmume/src/GPU.cpp
+++ b/desmume/src/GPU.cpp
@@ -3041,21 +3041,6 @@ void GPU_ligne(NDS_Screen * screen, u16 l)
 	GPU * gpu = screen->gpu;
 	GPU_tempScanline_valid = false;
 
-	//here is some setup which is only done on line 0
-	if(l == 0) {
-		for(int num=2;num<=3;num++)
-		{
-			BGxPARMS * parms;
-			if (num==2)
-				parms = &(gpu->dispx_st)->dispx_BG2PARMS;
-			else
-				parms = &(gpu->dispx_st)->dispx_BG3PARMS;		
-
-			parms->BGxX = gpu->affineInfo[num-2].x;
-			parms->BGxY = gpu->affineInfo[num-2].y;
-		}
-	}
-
 	//cache some parameters which are assumed to be stable throughout the rendering of the entire line
 	gpu->currLine = (u8)l;
 	u16 mosaic_control = T1ReadWord((u8 *)&gpu->dispx_st->dispx_MISC.MOSAIC, 0);
@@ -3148,12 +3133,6 @@ bool gpu_loadstate(std::istream* is)
 	return !is->fail();
 }
 
-void GPU::setAffineStart(int layer, int xy, u32 val)
-{
-	if(xy==0) affineInfo[layer-2].x = val;
-	else affineInfo[layer-2].y = val;
-}
-
 void gpu_UpdateRender()
 {
 	int x = 0, y = 0;
diff --git a/desmume/src/GPU.h b/desmume/src/GPU.h
index 9029cad68..70b0c0bb4 100644
--- a/desmume/src/GPU.h
+++ b/desmume/src/GPU.h
@@ -761,12 +761,6 @@ struct GPU
 
 
 	void __setFinalColorBck(u16 color, u8 x, bool opaque);
-	void setAffineStart(int layer, int xy, u32 val);
-
-	struct AffineInfo {
-		AffineInfo() : x(0), y(0) {}
-		u32 x, y;
-	} affineInfo[2];
 
 	void renderline_checkWindows(u16 x, bool &draw, bool &effect) const;
 
diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp
index f9c027817..6fee00b3e 100644
--- a/desmume/src/MMU.cpp
+++ b/desmume/src/MMU.cpp
@@ -2194,31 +2194,6 @@ void FASTCALL _MMU_ARM9_write32(u32 adr, u32 val)
 
 		switch(adr)
 		{
-			case REG_DISPA_BG2XL:
-				MainScreen.gpu->setAffineStart(2,0,val);
-				break;
-			case REG_DISPA_BG2YL:
-				MainScreen.gpu->setAffineStart(2,1,val);
-				break;
-			case REG_DISPB_BG2XL:
-				SubScreen.gpu->setAffineStart(2,0,val);
-				break;
-			case REG_DISPB_BG2YL:
-				SubScreen.gpu->setAffineStart(2,1,val);
-				break;
-			case REG_DISPA_BG3XL:
-				MainScreen.gpu->setAffineStart(3,0,val);
-				break;
-			case REG_DISPA_BG3YL:
-				MainScreen.gpu->setAffineStart(3,1,val);
-				break;
-			case REG_DISPB_BG3XL:
-				SubScreen.gpu->setAffineStart(3,0,val);
-				break;
-			case REG_DISPB_BG3YL:
-				SubScreen.gpu->setAffineStart(3,1,val);
-				break;
-
 			case 0x04000600:
 				GFX_FIFOcnt(val);
 				return;