diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp
index ec558e7ddc..a2d0bb2585 100644
--- a/plugins/GSdx/GSCrc.cpp
+++ b/plugins/GSdx/GSCrc.cpp
@@ -228,12 +228,6 @@ CRC::Game CRC::m_games[] =
 	{0xAA5EC3A3, TalesOfAbyss, JP, 0},
 	{0xFB236A46, SonicUnleashed, US, 0},
 	{0x8C913264, SonicUnleashed, EU, 0},
-	{0xD71B57F4, Genji, US, 0},
-	{0xFADEBC45, Genji, EU, 0},
-	{0xB4776FC1, Genji, JP, 0},
-	{0x56242EC9, Genji, KO, 0},
-	{0xCDAF243D, Genji, CH, 0},
-	{0x2A5E0B61, Genji, CH, 0},
 	{0xE04EA200, StarOcean3, EU, 0},
 	{0x23A97857, StarOcean3, US, 0},
 	{0xBEC32D49, StarOcean3, JP, 0},
diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h
index a969e9c93e..bfa1b4c0c8 100644
--- a/plugins/GSdx/GSCrc.h
+++ b/plugins/GSdx/GSCrc.h
@@ -57,7 +57,6 @@ public:
 		FIFA04,
 		FIFA05,
 		FightingBeautyWulong,
-		Genji,
 		GetaWay,
 		GetaWayBlackMonday,
 		GiTS,
diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
index 6680bbe91d..a377013b53 100644
--- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp
+++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
@@ -294,32 +294,6 @@ bool GSC_IkkiTousen(const GSFrameInfo& fi, int& skip)
 	return true;
 }
 
-bool GSC_Genji(const GSFrameInfo& fi, int& skip)
-{
-	if(skip == 0)
-	{
-		if(fi.TME && fi.FBP == 0x01500 && fi.FPSM == PSM_PSMCT16 && fi.TBP0 == 0x00e00 && fi.TPSM == PSM_PSMZ16)
-		{
-			// likely fixed in openGL (texture shuffle)
-			// Missing block at the top left
-			if (Dx_only)
-				skip = 6;
-			else
-				return false;
-		}
-		else if(fi.TPSM == PSM_PSMCT24 && fi.TME ==0x0001 && fi.TBP0==fi.FBP)
-		{
-			skip = 1; // Blur
-		}
-		else if(fi.TPSM == PSM_PSMT8H && fi.FBMSK == 0)
-		{
-			skip = 1; // White Fog
-		}
-	}
-
-	return true;
-}
-
 bool GSC_EvangelionJo(const GSFrameInfo& fi, int& skip)
 {
 	if(skip == 0)
@@ -1359,9 +1333,6 @@ void GSState::SetupCrcHack()
 		// Half Screen bottom issue
 		lut[CRC::Tekken5] = GSC_Tekken5;
 
-		// Needs testing
-		lut[CRC::Genji] = GSC_Genji;
-
 		// Texture shuffle
 		lut[CRC::BigMuthaTruckers] = GSC_BigMuthaTruckers;
 		lut[CRC::DeathByDegreesTekkenNinaWilliams] = GSC_DeathByDegreesTekkenNinaWilliams; // + Upscaling issues