diff --git a/src/mess/machine/ti99/genboard.c b/src/mess/machine/ti99/genboard.c
index aec05c5d5af..a883254ecf3 100644
--- a/src/mess/machine/ti99/genboard.c
+++ b/src/mess/machine/ti99/genboard.c
@@ -469,7 +469,6 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
 	{
 		dec = &debug;
 		decode(space, offset, false, false, dec);
-		return;
 	}
 	else
 	{
@@ -1078,11 +1077,6 @@ void geneve_mapper_device::device_start()
 
 	m_ready.resolve(conf->ready, *this);
 
-	// This is a preliminary setting; the initial context switch occurs before
-	// device_reset. Luckily, the reset vector at >0000/>0002 is the same for
-	// all variants of the boot eprom.
-//  m_eprom = machine().root_device().memregion("maincpu")->base();
-
 	m_sram = machine().root_device().memregion(SRAM_TAG)->base();
 	m_dram = machine().root_device().memregion(DRAM_TAG)->base();