diff --git a/src/GraphicsDrawer.cpp b/src/GraphicsDrawer.cpp
index 8c1ed99c..bd8aba6e 100644
--- a/src/GraphicsDrawer.cpp
+++ b/src/GraphicsDrawer.cpp
@@ -879,7 +879,6 @@ void GraphicsDrawer::drawScreenSpaceTriangle(u32 _numVtx, graphics::DrawModePara
 	g_debugger.addTriangles(triParams);
 	m_dmaVerticesNum = 0;
 
-#ifndef OLD_LLE
 	if (config.frameBufferEmulation.enable != 0) {
 		const f32 maxY = renderTriangles(m_dmaVertices.data(), nullptr, _numVtx);
 		frameBufferList().setBufferChanged(maxY);
@@ -890,7 +889,6 @@ void GraphicsDrawer::drawScreenSpaceTriangle(u32 _numVtx, graphics::DrawModePara
 				pCurrentDepthBuffer->setDirty();
 		}
 	}
-#endif
 	gSP.changed |= CHANGED_GEOMETRYMODE;
 }
 
diff --git a/src/gDP.cpp b/src/gDP.cpp
index 750842f8..7d298335 100644
--- a/src/gDP.cpp
+++ b/src/gDP.cpp
@@ -939,315 +939,6 @@ void gDPNoOp()
 	DebugMsg( DEBUG_NORMAL | DEBUG_IGNORED, "gDPNoOp();\n" );
 }
 
-/*******************************************
- *          Low level triangle             *
- *******************************************
- *    based on sources of ziggy's z64      *
- *******************************************/
-
-#ifdef OLD_LLE
-
-void gDPLLETriangle(u32 _w1, u32 _w2, int _shade, int _texture, int _zbuffer, u32 * _pRdpCmd)
-{
-	gSP.texture.level = _SHIFTR(_w1, 19, 3);
-	const u32 tile = _SHIFTR(_w1, 16, 3);
-	gDPTile *textureTileOrg[2];
-	textureTileOrg[0] = gSP.textureTile[0];
-	textureTileOrg[1] = gSP.textureTile[1];
-	gSP.textureTile[0] = &gDP.tiles[tile];
-	gSP.textureTile[1] = needReplaceTex1ByTex0() ? &gDP.tiles[tile] : &gDP.tiles[(tile + 1) & 7];
-
-	int j;
-	int xleft, xright, xleft_inc, xright_inc;
-	int r, g, b, a, z, s, t, w;
-	int drdx = 0, dgdx = 0, dbdx = 0, dadx = 0, dzdx = 0, dsdx = 0, dtdx = 0, dwdx = 0;
-	int drde = 0, dgde = 0, dbde = 0, dade = 0, dzde = 0, dsde = 0, dtde = 0, dwde = 0;
-	int flip = (_w1 & 0x800000) ? 1 : 0;
-
-	s32 yl, ym, yh;
-	s32 xl, xm, xh;
-	s32 dxldy, dxhdy, dxmdy;
-	u32 w3, w4, w5, w6, w7, w8;
-
-	u32 * shade_base = _pRdpCmd + 8;
-	u32 * texture_base = _pRdpCmd + 8;
-	u32 * zbuffer_base = _pRdpCmd + 8;
-
-	if (_shade != 0) {
-		texture_base += 16;
-		zbuffer_base += 16;
-	}
-	if (_texture != 0) {
-		zbuffer_base += 16;
-	}
-
-	w3 = _pRdpCmd[2];
-	w4 = _pRdpCmd[3];
-	w5 = _pRdpCmd[4];
-	w6 = _pRdpCmd[5];
-	w7 = _pRdpCmd[6];
-	w8 = _pRdpCmd[7];
-
-	yl = (_w1 & 0x3fff);
-	ym = ((_w2 >> 16) & 0x3fff);
-	yh = ((_w2 >> 0) & 0x3fff);
-	xl = (s32)(w3);
-	xh = (s32)(w5);
-	xm = (s32)(w7);
-	dxldy = (s32)(w4);
-	dxhdy = (s32)(w6);
-	dxmdy = (s32)(w8);
-
-	if (yl & (0x800 << 2)) yl |= 0xfffff000 << 2;
-	if (ym & (0x800 << 2)) ym |= 0xfffff000 << 2;
-	if (yh & (0x800 << 2)) yh |= 0xfffff000 << 2;
-
-	yh &= ~3;
-
-	r = 0xff; g = 0xff; b = 0xff; a = 0xff; z = 0xffff0000; s = 0;  t = 0;  w = 0x30000;
-
-	if (_shade != 0) {
-		r = (shade_base[0] & 0xffff0000) | ((shade_base[+4] >> 16) & 0x0000ffff);
-		g = ((shade_base[0] << 16) & 0xffff0000) | (shade_base[4] & 0x0000ffff);
-		b = (shade_base[1] & 0xffff0000) | ((shade_base[5] >> 16) & 0x0000ffff);
-		a = ((shade_base[1] << 16) & 0xffff0000) | (shade_base[5] & 0x0000ffff);
-		drdx = (shade_base[2] & 0xffff0000) | ((shade_base[6] >> 16) & 0x0000ffff);
-		dgdx = ((shade_base[2] << 16) & 0xffff0000) | (shade_base[6] & 0x0000ffff);
-		dbdx = (shade_base[3] & 0xffff0000) | ((shade_base[7] >> 16) & 0x0000ffff);
-		dadx = ((shade_base[3] << 16) & 0xffff0000) | (shade_base[7] & 0x0000ffff);
-		drde = (shade_base[8] & 0xffff0000) | ((shade_base[12] >> 16) & 0x0000ffff);
-		dgde = ((shade_base[8] << 16) & 0xffff0000) | (shade_base[12] & 0x0000ffff);
-		dbde = (shade_base[9] & 0xffff0000) | ((shade_base[13] >> 16) & 0x0000ffff);
-		dade = ((shade_base[9] << 16) & 0xffff0000) | (shade_base[13] & 0x0000ffff);
-	}
-	if (_texture != 0) {
-		s = (texture_base[0] & 0xffff0000) | ((texture_base[4] >> 16) & 0x0000ffff);
-		t = ((texture_base[0] << 16) & 0xffff0000) | (texture_base[4] & 0x0000ffff);
-		w = (texture_base[1] & 0xffff0000) | ((texture_base[5] >> 16) & 0x0000ffff);
-		//    w = abs(w);
-		dsdx = (texture_base[2] & 0xffff0000) | ((texture_base[6] >> 16) & 0x0000ffff);
-		dtdx = ((texture_base[2] << 16) & 0xffff0000) | (texture_base[6] & 0x0000ffff);
-		dwdx = (texture_base[3] & 0xffff0000) | ((texture_base[7] >> 16) & 0x0000ffff);
-		dsde = (texture_base[8] & 0xffff0000) | ((texture_base[12] >> 16) & 0x0000ffff);
-		dtde = ((texture_base[8] << 16) & 0xffff0000) | (texture_base[12] & 0x0000ffff);
-		dwde = (texture_base[9] & 0xffff0000) | ((texture_base[13] >> 16) & 0x0000ffff);
-	}
-	if (_zbuffer != 0) {
-		z = zbuffer_base[0];
-		dzdx = zbuffer_base[1];
-		dzde = zbuffer_base[2];
-	}
-
-	xh <<= 2;  xm <<= 2;  xl <<= 2;
-	r <<= 2;  g <<= 2;  b <<= 2;  a <<= 2;
-	dsde >>= 2;  dtde >>= 2;  dsdx >>= 2;  dtdx >>= 2;
-	dzdx >>= 2;  dzde >>= 2;
-	dwdx >>= 2;  dwde >>= 2;
-
-#define XSCALE(x) (float(x)/(1<<18))
-#define YSCALE(y) (float(y)/(1<<2))
-#define ZSCALE(z) ((gDP.otherMode.depthSource == G_ZS_PRIM)? gDP.primDepth.z : float(u32(z))/0xffff0000)
-#define PERSP_EN (gDP.otherMode.texturePersp != 0)
-#define WSCALE(z) 1.0f/(PERSP_EN? (float(u32(z) + 0x10000)/0xffff0000) : 1.0f)
-#define CSCALE(c) _FIXED2FLOATCOLOR((((c)>0x3ff0000? 0x3ff0000:((c)<0? 0 : (c)))>>18), 8)
-#define _PERSP(w) ( w )
-#define PERSP(s, w) ( ((s64)(s) << 20) / (_PERSP(w)? _PERSP(w):1) )
-#define SSCALE(s, _w) (PERSP_EN? float(PERSP(s, _w))/(1 << 10) : float(s)/(1<<21))
-#define TSCALE(s, w) (PERSP_EN? float(PERSP(s, w))/(1 << 10) : float(s)/(1<<21))
-
-	GraphicsDrawer & drawer = dwnd().getDrawer();
-	drawer.setDMAVerticesSize(16);
-	SPVertex * vtx0 = drawer.getDMAVerticesData();
-	SPVertex * vtx = vtx0;
-
-	xleft = xm;
-	xright = xh;
-	xleft_inc = dxmdy;
-	xright_inc = dxhdy;
-
-	while (yh<ym &&
-		!((!flip && xleft < xright + 0x10000) ||
-		(flip && xleft > xright - 0x10000))) {
-		xleft += xleft_inc;
-		xright += xright_inc;
-		s += dsde;    t += dtde;    w += dwde;
-		r += drde;    g += dgde;    b += dbde;    a += dade;
-		z += dzde;
-		yh++;
-	}
-
-	j = ym - yh;
-	if (j > 0) {
-		int dx = (xleft - xright) >> 16;
-		if ((!flip && xleft < xright) || (flip/* && xleft > xright*/))
-		{
-			if (_shade != 0) {
-				vtx->r = CSCALE(r + drdx*dx);
-				vtx->g = CSCALE(g + dgdx*dx);
-				vtx->b = CSCALE(b + dbdx*dx);
-				vtx->a = CSCALE(a + dadx*dx);
-			}
-			if (_texture != 0) {
-				vtx->s = SSCALE(s + dsdx*dx, w + dwdx*dx);
-				vtx->t = TSCALE(t + dtdx*dx, w + dwdx*dx);
-			}
-			vtx->x = XSCALE(xleft);
-			vtx->y = YSCALE(yh);
-			vtx->z = ZSCALE(z + dzdx*dx);
-			vtx->w = WSCALE(w + dwdx*dx);
-			++vtx;
-		}
-		if ((!flip/* && xleft < xright*/) || (/*flip &&*/ xleft > xright))
-		{
-			if (_shade != 0) {
-				vtx->r = CSCALE(r);
-				vtx->g = CSCALE(g);
-				vtx->b = CSCALE(b);
-				vtx->a = CSCALE(a);
-			}
-			if (_texture != 0) {
-				vtx->s = SSCALE(s, w);
-				vtx->t = TSCALE(t, w);
-			}
-			vtx->x = XSCALE(xright);
-			vtx->y = YSCALE(yh);
-			vtx->z = ZSCALE(z);
-			vtx->w = WSCALE(w);
-			++vtx;
-		}
-		xleft += xleft_inc*j;  xright += xright_inc*j;
-		s += dsde*j;  t += dtde*j;
-		if (w + dwde*j != 0) w += dwde*j;
-		else w += dwde*(j - 1);
-		r += drde*j;  g += dgde*j;  b += dbde*j;  a += dade*j;
-		z += dzde*j;
-		// render ...
-	}
-
-	if (xl != xh)
-		xleft = xl;
-
-	//if (yl-ym > 0)
-	{
-		int dx = (xleft - xright) >> 16;
-		if ((!flip && xleft <= xright) ||
-			(flip/* && xleft >= xright*/))
-		{
-			if (_shade != 0) {
-				vtx->r = CSCALE(r + drdx*dx);
-				vtx->g = CSCALE(g + dgdx*dx);
-				vtx->b = CSCALE(b + dbdx*dx);
-				vtx->a = CSCALE(a + dadx*dx);
-			}
-			if (_texture != 0) {
-				vtx->s = SSCALE(s + dsdx*dx, w + dwdx*dx);
-				vtx->t = TSCALE(t + dtdx*dx, w + dwdx*dx);
-			}
-			vtx->x = XSCALE(xleft);
-			vtx->y = YSCALE(ym);
-			vtx->z = ZSCALE(z + dzdx*dx);
-			vtx->w = WSCALE(w + dwdx*dx);
-			++vtx;
-		}
-		if ((!flip/* && xleft <= xright*/) ||
-			(/*flip && */xleft >= xright))
-		{
-			if (_shade != 0) {
-				vtx->r = CSCALE(r);
-				vtx->g = CSCALE(g);
-				vtx->b = CSCALE(b);
-				vtx->a = CSCALE(a);
-			}
-			if (_texture != 0) {
-				vtx->s = SSCALE(s, w);
-				vtx->t = TSCALE(t, w);
-			}
-			vtx->x = XSCALE(xright);
-			vtx->y = YSCALE(ym);
-			vtx->z = ZSCALE(z);
-			vtx->w = WSCALE(w);
-			++vtx;
-		}
-	}
-	xleft_inc = dxldy;
-	xright_inc = dxhdy;
-
-	j = yl - ym;
-	//j--; // ?
-	xleft += xleft_inc*j;  xright += xright_inc*j;
-	s += dsde*j;  t += dtde*j;  w += dwde*j;
-	r += drde*j;  g += dgde*j;  b += dbde*j;  a += dade*j;
-	z += dzde*j;
-
-	while (yl>ym &&
-		!((!flip && xleft < xright + 0x10000) ||
-		(flip && xleft > xright - 0x10000))) {
-		xleft -= xleft_inc;    xright -= xright_inc;
-		s -= dsde;    t -= dtde;    w -= dwde;
-		r -= drde;    g -= dgde;    b -= dbde;    a -= dade;
-		z -= dzde;
-		--j;
-		--yl;
-	}
-
-	// render ...
-	if (j >= 0) {
-		int dx = (xleft - xright) >> 16;
-		if ((!flip && xleft <= xright) ||
-			(flip/* && xleft >= xright*/))
-		{
-			if (_shade != 0) {
-				vtx->r = CSCALE(r + drdx*dx);
-				vtx->g = CSCALE(g + dgdx*dx);
-				vtx->b = CSCALE(b + dbdx*dx);
-				vtx->a = CSCALE(a + dadx*dx);
-			}
-			if (_texture != 0) {
-				vtx->s = SSCALE(s + dsdx*dx, w + dwdx*dx);
-				vtx->t = TSCALE(t + dtdx*dx, w + dwdx*dx);
-			}
-			vtx->x = XSCALE(xleft);
-			vtx->y = YSCALE(yl);
-			vtx->z = ZSCALE(z + dzdx*dx);
-			vtx->w = WSCALE(w + dwdx*dx);
-			++vtx;
-		}
-		if ((!flip/* && xleft <= xright*/) ||
-			(/*flip &&*/ xleft >= xright))
-		{
-			if (_shade != 0) {
-				vtx->r = CSCALE(r);
-				vtx->g = CSCALE(g);
-				vtx->b = CSCALE(b);
-				vtx->a = CSCALE(a);
-			}
-			if (_texture != 0) {
-				vtx->s = SSCALE(s, w);
-				vtx->t = TSCALE(t, w);
-			}
-			vtx->x = XSCALE(xright);
-			vtx->y = YSCALE(yl);
-			vtx->z = ZSCALE(z);
-			vtx->w = WSCALE(w);
-			++vtx;
-		}
-	}
-
-	if (_texture != 0)
-		gDP.changed |= CHANGED_TILE;
-	if (_zbuffer != 0)
-		gSP.geometryMode |= G_ZBUFFER;
-
-	drawer.drawScreenSpaceTriangle(static_cast<u32>(vtx - vtx0));
-	gSP.textureTile[0] = textureTileOrg[0];
-	gSP.textureTile[1] = textureTileOrg[1];
-
-	DebugMsg(DEBUG_NORMAL, "gDPLLETriangle(%08x, %08x) shade: %d, texture: %d, zbuffer: %d\n",
-		_w1, _w2, _shade, _texture, _zbuffer);
-}
-
-#endif // OLD_LLE
-
 LLETriangle::LLETriangle()
 {
 	m_textureTileOrg[0] = gSP.textureTile[0];
@@ -1279,7 +970,6 @@ void LLETriangle::start(u32 _tile)
 
 void LLETriangle::flush(u32 _cmd)
 {
-#ifndef OLD_LLE
 	if (_cmd >= 0x08 && _cmd <= 0x0f)
 		return;
 
@@ -1292,7 +982,6 @@ void LLETriangle::flush(u32 _cmd)
 	gSP.texture.scales = m_textureScaleOrg[0];
 	gSP.texture.scalet = m_textureScaleOrg[1];
 	m_flushed = true;
-#endif
 }
 
 void LLETriangle::draw(bool _shade, bool _texture, bool _zbuffer, u32 * _pData)
@@ -1654,118 +1343,79 @@ void LLETriangle::draw(bool _shade, bool _texture, bool _zbuffer, u32 * _pData)
 	}
 }
 
-#ifdef OLD_LLE
-static void gDPTriangle(u32 _w1, u32 _w2, int shade, int texture, int zbuffer)
-{
-	gDPLLETriangle(_w1, _w2, shade, texture, zbuffer, RDP.cmd_data + RDP.cmd_cur);
-}
-#endif
-
 void gDPTriFill(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 8 * sizeof(s32));
 	memset(&ewdata[8], 0, 36 * sizeof(s32));
 	LLETriangle::get().draw(0, 0, 0, ewdata);
-#else
-	gDPTriangle(w0, w1, 0, 0, 0);
-#endif
 	DebugMsg( DEBUG_NORMAL, "trifill\n");
 }
 
 void gDPTriShade(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 24 * sizeof(s32));
 	memset(&ewdata[24], 0, 20 * sizeof(s32));
 	LLETriangle::get().draw(1, 0, 0, ewdata);
-#else
-	gDPTriangle(w0, w1, 1, 0, 0);
-#endif
 	DebugMsg( DEBUG_NORMAL, "trishade\n");
 }
 
 void gDPTriTxtr(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 8 * sizeof(s32));
 	memset(&ewdata[8], 0, 16 * sizeof(s32));
 	memcpy(&ewdata[24], RDP.cmd_data + RDP.cmd_cur + 8, 16 * sizeof(s32));
 	memset(&ewdata[40], 0, 4 * sizeof(s32));
 	LLETriangle::get().draw(0, 1, 0, ewdata);
-#else
-	gDPTriangle(w0, w1, 0, 1, 0);
-#endif
 	DebugMsg(DEBUG_NORMAL, "tritxtr\n");
 }
 
 void gDPTriShadeTxtr(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 40 * sizeof(s32));
 	memset(&ewdata[40], 0, 4 * sizeof(s32));
 	LLETriangle::get().draw(1, 1, 0, ewdata);
-#else
-	gDPTriangle(w0, w1, 1, 1, 0);
-#endif
 	DebugMsg( DEBUG_NORMAL, "trishadetxtr\n");
 }
 
 void gDPTriFillZ(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 8 * sizeof(s32));
 	memset(&ewdata[8], 0, 32 * sizeof(s32));
 	memcpy(&ewdata[40], RDP.cmd_data + RDP.cmd_cur + 8, 4 * sizeof(s32));
 	LLETriangle::get().draw(0, 0, 1, ewdata);
-#else
-	gDPTriangle(w0, w1, 0, 0, 1);
-#endif
 	DebugMsg( DEBUG_NORMAL, "trifillz\n");
 }
 
 void gDPTriShadeZ(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 24 * sizeof(s32));
 	memset(&ewdata[24], 0, 16 * sizeof(s32));
 	memcpy(&ewdata[40], RDP.cmd_data + RDP.cmd_cur + 24, 4 * sizeof(s32));
 	LLETriangle::get().draw(1, 0, 1, ewdata);
-#else
-	gDPTriangle(w0, w1, 1, 0, 1);
-#endif
 	DebugMsg( DEBUG_NORMAL, "trishadez\n");
 }
 
 void gDPTriTxtrZ(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 8 * sizeof(s32));
 	memset(&ewdata[8], 0, 16 * sizeof(s32));
 	memcpy(&ewdata[24], RDP.cmd_data + RDP.cmd_cur + 8, 16 * sizeof(s32));
 	memcpy(&ewdata[40], RDP.cmd_data + RDP.cmd_cur + 24, 4 * sizeof(s32));
 	LLETriangle::get().draw(0, 1, 1, ewdata);
-#else
-	gDPTriangle(w0, w1, 0, 1, 1);
-#endif
 	DebugMsg( DEBUG_NORMAL, "tritxtrz\n");
 }
 
 void gDPTriShadeTxtrZ(u32 w0, u32 w1)
 {
-#ifndef OLD_LLE
 	u32 ewdata[44];
 	memcpy(&ewdata[0], RDP.cmd_data + RDP.cmd_cur, 44 * sizeof(s32));
 	LLETriangle::get().draw(1, 1, 1, ewdata);
-#else
-	gDPTriangle(w0, w1, 1, 1, 1);
-#endif
 	DebugMsg( DEBUG_NORMAL, "trishadetxtrz\n");
 }
diff --git a/src/gDP.h b/src/gDP.h
index ae1c8b02..021c3dc3 100644
--- a/src/gDP.h
+++ b/src/gDP.h
@@ -260,8 +260,6 @@ struct gDPInfo
 
 extern gDPInfo gDP;
 
-//#define OLD_LLE
-
 class LLETriangle
 {
 public: