diff --git a/core/hw/aica/sgc_if.cpp b/core/hw/aica/sgc_if.cpp
index f02771120..c54bff3da 100755
--- a/core/hw/aica/sgc_if.cpp
+++ b/core/hw/aica/sgc_if.cpp
@@ -392,7 +392,7 @@ struct ChannelEx
 
 		return rv;
 	}
-	__forceinline bool Step(SampleType& oLeft, SampleType& oRight, SampleType& oDsp, int32_t mixl, int32_t mixr)
+	__forceinline bool Step(SampleType& oLeft, SampleType& oRight, SampleType& oDsp)
 	{
 		if (!enabled)
 		{
@@ -431,33 +431,6 @@ struct ChannelEx
 			clip_verify(sample*oRight>=0);
 			clip_verify(sample*oDsp>=0);
 
-			if (settings.aica.EGHack)
-			{
-				if ((s64)(this->ccd->DL + mixl + mixr + *VolMix.DSPOut) == 0)
-				{
-					switch(this->AEG.state)
-					{
-					case EG_Decay1:
-						if(this->AEG.AttackRate > this->AEG.Decay1Rate)
-						{
-							//printf("Promote 1\n");
-							this->SetAegState(EG_Attack);
-						}
-
-						break;
-
-					case EG_Decay2:
-						if(this->AEG.AttackRate > this->AEG.Decay2Rate)
-						{
-							//printf("Promote 2\n");
-							this->SetAegState(EG_Attack);
-						}
-
-						break;
-					}
-				}
-			}
-
 			StepAEG(this);
 			StepFEG(this);
 			StepStream(this);
@@ -470,7 +443,7 @@ struct ChannelEx
 	{
 		SampleType oLeft,oRight,oDsp;
 
-		Step(oLeft, oRight, oDsp, mixl, mixr);
+		Step(oLeft, oRight, oDsp);
 
 		*VolMix.DSPOut+=oDsp;
 		mixl+=oLeft;
@@ -1227,7 +1200,7 @@ void AICA_Sample32()
 		{
 			SampleType oLeft,oRight,oDsp;
 			//stop working on this channel if its turned off ...
-			if (!Chans[ch].Step(oLeft, oRight, oDsp, mxlr[i * 2 + 0], mxlr[i * 2 + 1]))
+			if (!Chans[ch].Step(oLeft, oRight, oDsp))
 				break;
 
 			sg++;
diff --git a/core/nullDC.cpp b/core/nullDC.cpp
index 7380ebf8b..6d0099ce7 100755
--- a/core/nullDC.cpp
+++ b/core/nullDC.cpp
@@ -131,39 +131,6 @@ void* webui_th(void* p)
 cThread webui_thd(&webui_th,0);
 #endif
 
-const char *EGHackGamesList[] = {
-		"T46703M",		/* Border Down (Japan) */
-		"MK-51065",		/* Bomberman Online (USA) */
-		"RDC-0117",		/* Bomberman Online (USA) */
-		"T47801M",		/* Chaos Field (Japan) */
-		"T23202M",		/* Death Crimson OX (Japan) */
-		"T2401N",		/* Death Crimson OX (USA) */
-		"T1223M",		/* Eldorado Gate Vol. 1 (Japan) */
-		"T44306N",		/* Fatal Fury: Mark of the Wolves (USA) */
-		"T3108M",		/* Garou: Mark of the Wolves (Japan) */
-		"HDR-0078",		/* Jet Set Radio (Japan) */
-		"MK-51058",		/* Jet Grind Radio (USA, Europe) */
-		"HDR-0079",		/* Napple Tale (Japan) */
-		"MK-5110050",	/* Phantasy Star Online (Europe) */
-		"HDR-0129",		/* Phantasy Star Online (Japan) */
-		"MK-51100",		/* Phantasy Star Online (USA) */
-		"MK-5119350",	/* Phantasy Star Online Ver. 2 (Europe) */
-		"HDR-0163",		/* Phantasy Star Online Ver. 2 (Japan) */
-		"MK-51193",		/* Phantasy Star Online Ver. 2 (USA) */
-		"T9907M",		/* Psyvariar 2 (Japan) */
-		"HDR-0216",		/* Puyo Puyo Fever (Japan) */
-		"T47802M",		/* Radirgy (Japan) */
-		"HDR-0151",		/* Segagaga (Japan) */
-		"HDR-0125",		/* Sonic Shuffle (Japan) */
-		"MK-5106050",	/* Sonic Shuffle (Europe) */
-		"MK-51060",		/* Sonic Shuffle (USA) */
-		"T29102M",		/* Trigger Heart Exelica (Japan) */
-		"T45101M",		/* WWF Royal Rumble (Japan) */
-		"T10003D 50",	/* WWF Royal Rumble (Europe) */
-		"T10005N",		/* WWF Royal Rumble (USA) */
-		NULL
-};
-
 void LoadSpecialSettings()
 {
 	// Tony Hawk's Pro Skater 2
@@ -174,13 +141,6 @@ void LoadSpecialSettings()
 	if (!strncmp("HDR-0176", reios_product_number, 8) || !strncmp("RDC-0057", reios_product_number, 8))
 		// Cosmic Smash
 		settings.rend.TranslucentPolygonDepthMask = 1;
-	for (int i = 0; EGHackGamesList[i] != NULL; i++)
-		if (!strncmp(reios_product_number, EGHackGamesList[i], strlen(EGHackGamesList[i])))
-		{
-			printf("Enabling EG Hack\n");
-			settings.aica.EGHack = 1;
-			break;
-		}
 	// Pro Pinball Trilogy
 	if (!strncmp("T30701D", reios_product_number, 7)
 		// Demolition Racer
@@ -312,7 +272,6 @@ void LoadSettings()
 	settings.aica.LimitFPS			= cfgLoadInt("config","aica.LimitFPS",1);
 	settings.aica.NoBatch			= cfgLoadInt("config","aica.NoBatch",0);
     settings.aica.NoSound			= cfgLoadInt("config","aica.NoSound",0);
-    settings.aica.EGHack			= cfgLoadInt("config","aica.EGHack", 0);;
 	settings.rend.UseMipmaps		= cfgLoadInt("config","rend.UseMipmaps",1);
 	settings.rend.WideScreen		= cfgLoadInt("config","rend.WideScreen",0);
 	settings.rend.ShowFPS			= cfgLoadInt("config", "rend.ShowFPS", 0);
diff --git a/core/types.h b/core/types.h
index 566e8604c..b962ab1ab 100644
--- a/core/types.h
+++ b/core/types.h
@@ -657,7 +657,6 @@ struct settings_t
 		u32 DSPEnabled;		//0 -> no, 1 -> yes
 		u32 NoBatch;
         u32 NoSound;        //0 ->sound, 1 -> no sound
-        u32 EGHack;
 	} aica;
 
 #if USE_OMX