diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 9807b320403..f3468c4e818 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -63,8 +63,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 5) 'hvoltage'
 
   - There is sort of "debug mode" that you can access if 0x000038.w returns 0x0000
-    instead of 0xffff. To enable it, turn HVOLTAGE_DEBUG to 1 then enable the fake
-    Dip Switch.
+    instead of 0xffff. To enable it, use the MAME debugger or cheats.
   - When you are in "debug mode", the Inputs and Dip Switches have special features.
     Here is IMO the full list :
 
@@ -364,8 +363,6 @@ D
 #include "machine/nvram.h"
 #include "includes/equites.h"
 
-#define HVOLTAGE_DEBUG  0
-
 #define FRQ_ADJUSTER_TAG    "FRQ"
 
 // MSM5232 clock is generated by a transistor oscillator circuit, not by the pcb xtal
@@ -378,7 +375,6 @@ D
 
 
 
-
 /******************************************************************************/
 // Sound
 
@@ -602,14 +598,6 @@ WRITE8_MEMBER(equites_state::equites_8155_w)
 /******************************************************************************/
 // Main CPU Handlers
 
-#if HVOLTAGE_DEBUG
-READ16_MEMBER(equites_state::hvoltage_debug_r)
-{
-	return(ioport("FAKE")->read());
-}
-#endif
-
-
 CUSTOM_INPUT_MEMBER(equites_state::gekisou_unknown_status)
 {
 	return m_unknown_bit;
@@ -945,20 +933,11 @@ static INPUT_PORTS_START( hvoltage )
 	PORT_START("IN1")
 	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 )
 	PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_COIN2 )
-#if HVOLTAGE_DEBUG
-	PORT_DIPNAME( 0x0400, 0x0000, "Invulnerability" ) PORT_DIPLOCATION("SW:!6")
-	PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
-	PORT_DIPSETTING(      0x0400, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0800, 0x0000, "Need to kill Bosses" ) PORT_DIPLOCATION("SW:!5")
-	PORT_DIPSETTING(      0x0800, DEF_STR( No ) )
-	PORT_DIPSETTING(      0x0000, DEF_STR( Yes ) )
-#else
 	PORT_DIPNAME( 0x0c00, 0x0000, DEF_STR ( Difficulty ) ) PORT_DIPLOCATION("SW:!6,!5")
 	PORT_DIPSETTING(      0x0400, DEF_STR( Easy ) )
 	PORT_DIPSETTING(      0x0000, DEF_STR( Normal ) )
 	PORT_DIPSETTING(      0x0800, DEF_STR( Hard ) )
 	PORT_DIPSETTING(      0x0c00, DEF_STR( Hardest ) )
-#endif
 	PORT_DIPNAME( 0x1000, 0x0000, DEF_STR ( Lives ) ) PORT_DIPLOCATION("SW:!4") // See notes
 	PORT_DIPSETTING(      0x0000, "3" )
 	PORT_DIPSETTING(      0x1000, "5" )
@@ -971,14 +950,6 @@ static INPUT_PORTS_START( hvoltage )
 	PORT_DIPSETTING(      0x4000, "A 1C/2C B 1C/4C" )
 	PORT_DIPSETTING(      0x8000, "A 1C/3C B 1C/6C" )
 
-#if HVOLTAGE_DEBUG
-	/* Fake port to handle debug mode */
-	PORT_START("FAKE")
-	PORT_DIPNAME( 0xffff, 0xffff, "Debug Mode" )
-	PORT_DIPSETTING(      0xffff, DEF_STR( Off ) )
-	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
-#endif
-
 	/* this is actually a variable resistor */
 	PORT_START(FRQ_ADJUSTER_TAG)
 	PORT_ADJUSTER(27, "MSM5232 Clock")
@@ -1852,15 +1823,6 @@ DRIVER_INIT_MEMBER(equites_state,splndrbt)
 	unpack_region("gfx3");
 }
 
-DRIVER_INIT_MEMBER(equites_state,hvoltage)
-{
-	unpack_region("gfx3");
-
-#if HVOLTAGE_DEBUG
-	m_maincpu->space(AS_PROGRAM).install_read_handler(0x000038, 0x000039, read16_delegate(FUNC(equites_state::hvoltage_debug_r),this));
-#endif
-}
-
 
 
 /******************************************************************************/
@@ -1877,4 +1839,4 @@ GAME( 1985, gekisou,  0,        gekisou,  gekisou,  equites_state, gekisou,  ROT
 
 // Splendor Blast Hardware
 GAME( 1985, splndrbt, 0,        splndrbt, splndrbt, equites_state, splndrbt, ROT0,  "Alpha Denshi Co.", "Splendor Blast", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, hvoltage, 0,        hvoltage, hvoltage, equites_state, hvoltage, ROT0,  "Alpha Denshi Co.", "High Voltage", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, hvoltage, 0,        hvoltage, hvoltage, equites_state, splndrbt, ROT0,  "Alpha Denshi Co.", "High Voltage", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index 4cd0e9a3a44..6bd7f4a6c68 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -85,7 +85,6 @@ public:
 	DECLARE_WRITE8_MEMBER(equites_dac_latch_w);
 	DECLARE_WRITE8_MEMBER(equites_8155_portb_w);
 	DECLARE_WRITE8_MEMBER(equites_8155_w);
-	DECLARE_READ16_MEMBER(hvoltage_debug_r);
 	DECLARE_WRITE16_MEMBER(gekisou_unknown_0_w);
 	DECLARE_WRITE16_MEMBER(gekisou_unknown_1_w);
 	DECLARE_READ16_MEMBER(equites_spriteram_kludge_r);
@@ -111,7 +110,6 @@ public:
 	DECLARE_WRITE8_MEMBER(equites_8910portb_w);
 	DECLARE_DRIVER_INIT(bullfgtr);
 	DECLARE_DRIVER_INIT(kouyakyu);
-	DECLARE_DRIVER_INIT(hvoltage);
 	DECLARE_DRIVER_INIT(gekisou);
 	DECLARE_DRIVER_INIT(splndrbt);
 	DECLARE_DRIVER_INIT(equites);