diff --git a/Source/HBIOS/Config/DUO_std.asm b/Source/HBIOS/Config/DUO_std.asm
index 9ffb3537..c66ff54e 100644
--- a/Source/HBIOS/Config/DUO_std.asm
+++ b/Source/HBIOS/Config/DUO_std.asm
@@ -44,5 +44,3 @@ MDFFENABLE	.SET	FALSE		; MD: ENABLE FLASH FILE SYSTEM
 ;
 UARTINTS	.SET	FALSE		; UART: INCLUDE INTERRUPT SUPPORT UNDER IM1/2/3
 ;UARTCFG	.SET	UARTCFG | SER_RTS
-;
-HWTENABLE	.SET	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/Config/MBC_std.asm b/Source/HBIOS/Config/MBC_std.asm
index fc8322d6..bc7ede06 100644
--- a/Source/HBIOS/Config/MBC_std.asm
+++ b/Source/HBIOS/Config/MBC_std.asm
@@ -58,7 +58,3 @@ CVDUMON		.SET	CVDUMON_CGA	; CVDU: CVDU MONITOR SETUP: CVDUMON_[NONE|CGA|EGA]
 FDENABLE	.SET	TRUE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 ;
 PPIDEENABLE	.SET	TRUE		; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM)
-
-PS2KENABLE	.SET	FALSE		; PS2 KEYBOARD ON IM2 INTERRUPT CIRCUIT
-PS2PORT		.SET	$E2		; PS2 KEYBOARD PORT
-HWTENABLE	.SET	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_duo.asm b/Source/HBIOS/cfg_duo.asm
index cccb1f69..43849289 100644
--- a/Source/HBIOS/cfg_duo.asm
+++ b/Source/HBIOS/cfg_duo.asm
@@ -300,5 +300,3 @@ DMAMODE		.EQU	DMAMODE_DUO	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_dyno.asm b/Source/HBIOS/cfg_dyno.asm
index b4ac149a..bbf28af2 100644
--- a/Source/HBIOS/cfg_dyno.asm
+++ b/Source/HBIOS/cfg_dyno.asm
@@ -286,5 +286,3 @@ DMAMODE		.EQU	DMAMODE_Z180	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_master.asm b/Source/HBIOS/cfg_master.asm
index cec52d66..927b91f0 100644
--- a/Source/HBIOS/cfg_master.asm
+++ b/Source/HBIOS/cfg_master.asm
@@ -374,5 +374,3 @@ DMAMODE		.EQU	DMAMODE_NONE	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_mbc.asm b/Source/HBIOS/cfg_mbc.asm
index 28cc5b54..2fa4af3b 100644
--- a/Source/HBIOS/cfg_mbc.asm
+++ b/Source/HBIOS/cfg_mbc.asm
@@ -298,7 +298,3 @@ DMAMODE		.EQU	DMAMODE_MBC	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-PS2KENABLE	.EQU	FALSE		; PS2 KEYBOARD ON IM2 INTERRUPT CIRCUIT
-PS2PORT		.EQU	$E2		; PS2 KEYBOARD PORT
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_mk4.asm b/Source/HBIOS/cfg_mk4.asm
index 31b764cd..8581cd66 100644
--- a/Source/HBIOS/cfg_mk4.asm
+++ b/Source/HBIOS/cfg_mk4.asm
@@ -295,5 +295,3 @@ DMAMODE		.EQU	DMAMODE_ECB	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER 
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_n8.asm b/Source/HBIOS/cfg_n8.asm
index 78c03f83..7242fcd2 100644
--- a/Source/HBIOS/cfg_n8.asm
+++ b/Source/HBIOS/cfg_n8.asm
@@ -288,5 +288,3 @@ DMAMODE		.EQU	DMAMODE_Z180	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER 
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_rcz180.asm b/Source/HBIOS/cfg_rcz180.asm
index e9331174..015c45cd 100644
--- a/Source/HBIOS/cfg_rcz180.asm
+++ b/Source/HBIOS/cfg_rcz180.asm
@@ -312,5 +312,3 @@ DMAMODE		.EQU	DMAMODE_Z180	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.SET	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_rcz280.asm b/Source/HBIOS/cfg_rcz280.asm
index 32c737ed..bfbf4e10 100644
--- a/Source/HBIOS/cfg_rcz280.asm
+++ b/Source/HBIOS/cfg_rcz280.asm
@@ -316,5 +316,3 @@ DMAMODE		.EQU	DMAMODE_Z280	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.SET	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_rcz80.asm b/Source/HBIOS/cfg_rcz80.asm
index 78ccc76c..23c05b7a 100644
--- a/Source/HBIOS/cfg_rcz80.asm
+++ b/Source/HBIOS/cfg_rcz80.asm
@@ -310,5 +310,3 @@ DMAMODE		.EQU	DMAMODE_RC	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_rph.asm b/Source/HBIOS/cfg_rph.asm
index 7c01e095..72fe5dc4 100644
--- a/Source/HBIOS/cfg_rph.asm
+++ b/Source/HBIOS/cfg_rph.asm
@@ -277,5 +277,3 @@ DMAMODE		.EQU	DMAMODE_Z180	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
\ No newline at end of file
diff --git a/Source/HBIOS/cfg_s100.asm b/Source/HBIOS/cfg_s100.asm
index 0a4d7928..82ae4d2d 100644
--- a/Source/HBIOS/cfg_s100.asm
+++ b/Source/HBIOS/cfg_s100.asm
@@ -306,5 +306,3 @@ DMAMODE		.EQU	DMAMODE_Z180	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_sbc.asm b/Source/HBIOS/cfg_sbc.asm
index 5bf1244f..1f2b771f 100644
--- a/Source/HBIOS/cfg_sbc.asm
+++ b/Source/HBIOS/cfg_sbc.asm
@@ -276,5 +276,3 @@ DMAMODE		.EQU	DMAMODE_ECB	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_scz180.asm b/Source/HBIOS/cfg_scz180.asm
index f3f5d5aa..1861892f 100644
--- a/Source/HBIOS/cfg_scz180.asm
+++ b/Source/HBIOS/cfg_scz180.asm
@@ -306,5 +306,3 @@ DMAMODE		.EQU	DMAMODE_Z180	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_una.asm b/Source/HBIOS/cfg_una.asm
index 58ac234e..8fe2817c 100644
--- a/Source/HBIOS/cfg_una.asm
+++ b/Source/HBIOS/cfg_una.asm
@@ -36,5 +36,3 @@ ROMSIZE		.EQU	512		; SIZE OF ROM IN KB (MUST MATCH YOUR HARDWARE!!!)
 RTCIO		.EQU	$70		; RTC LATCH REGISTER ADR
 ;
 DSKYENABLE	.EQU	FALSE		; ENABLES DSKY (DO NOT COMBINE WITH PPIDE)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_z80retro.asm b/Source/HBIOS/cfg_z80retro.asm
index 97df4356..8e618a48 100644
--- a/Source/HBIOS/cfg_z80retro.asm
+++ b/Source/HBIOS/cfg_z80retro.asm
@@ -237,5 +237,3 @@ DMAMODE		.EQU	DMAMODE_NONE	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_zeta.asm b/Source/HBIOS/cfg_zeta.asm
index 839705d4..2869093a 100644
--- a/Source/HBIOS/cfg_zeta.asm
+++ b/Source/HBIOS/cfg_zeta.asm
@@ -208,5 +208,3 @@ DMAMODE		.EQU	DMAMODE_NONE	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/cfg_zeta2.asm b/Source/HBIOS/cfg_zeta2.asm
index 74d132bd..9a8aa5e2 100644
--- a/Source/HBIOS/cfg_zeta2.asm
+++ b/Source/HBIOS/cfg_zeta2.asm
@@ -219,5 +219,3 @@ DMAMODE		.EQU	DMAMODE_NONE	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC|MBC|DUO)
 ;
 YM2612ENABLE	.EQU	FALSE		; YM2612: ENABLE YM2612 DRIVER (MUTE STUB)
 VGMBASE		.EQU	$C0		; YM2612: BASE ADDRESS FOR VGM BOARD (YM2612/SN76489s/CTC)
-;
-HWTENABLE	.EQU	FALSE		; HARDWARE TIMER ON IM2 INTERRUPT CIRCUIT
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 8cd5c948..c4e7e0ab 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -2153,30 +2153,34 @@ HB_CPU3:
 ;
 #ENDIF
 ;
-#IF (HWTENABLE & (INTMODE == 2))	; HARDWARE TIMER TICK
-
-  #IF (PLATFORM == PLT_MBC)
-	LD	HL,HB_TIMINT
-	LD	(IVT(INT_IM2PH7)),HL	; IVT ENTRY FOR TIMER
-  #ENDIF
-
-  #IF (PLATFORM == PLT_DUO)
-	LD	HL,HB_TIMINT
-	LD	(IVT(INT_IM2PH0)),HL	; IVT ENTRY FOR TIMER
-  #ENDIF
-
-#ENDIF
+; TEMPLATE FOR SETTING UP INTERRUPTS USING THE MBC/DUODYNE IM2 INTERRUPT
+; PIN HEADERS. UPDATE HB_DUMMYx TO POINT TO THE INTERRUPT ROUTINE.
+; IN STD.ASM ALLOCATE THE EQUIVALENT INT_IM2PHx INTERRUPT TABLE ENTRY NUMBER. 
+;
+;
+;	LD	HL,HB_DUMMY0
+;	LD	(IVT(INT_IM2PH0)),HL
+;
+;	LD	HL,HB_DUMMY1
+;	LD	(IVT(INT_IM2PH1)),HL
+;
+;	LD	HL,HB_DUMMY2
+;	LD	(IVT(INT_IM2PH2)),HL
+;
+;	LD	HL,HB_DUMMY3
+;	LD	(IVT(INT_IM2PH3)),HL
 ;
-; PS2 KEYBOARD INTERRUPT
+;	LD	HL,HB_DUMMY4
+;	LD	(IVT(INT_IM2PH4)),HL
 ;
-;  #IF (PS2KENABLE & !(CVDUENABLE | VGAENABLE) | GDCENABLE | (TMSENABLE & ((TMSMODE == TMSMODE_MSXKBD) | (TMSMODE == TMSMODE_MBC))))	
+;	LD	HL,HB_DUMMY5
+;	LD	(IVT(INT_IM2PH5)),HL
 ;
-;    #IF (INTMODE == 2)
-;	LD	HL,KBD_INT
-;	LD	(IVT(INT_IM2PH1)),HL	; IVT ENTRY FOR KEYBOARD
-;    #ENDIF
+;	LD	HL,HB_DUMMY6
+;	LD	(IVT(INT_IM2PH6)),HL
 ;
-;   #ENDIF
+;	LD	HL,HB_DUMMY7
+;	LD	(IVT(INT_IM2PH7)),HL
 ;
 #IF (KIOENABLE)
 	CALL	KIO_PREINIT
diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm
index f8f0514a..5bc680d0 100644
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@@ -764,13 +764,13 @@ INT_SIO1	.EQU	14	; ZILOG SIO 1, CHANNEL A & B
 ; MBC IM2 PINHEADER INTERRUPTS
 ;
 ;INT_IM2PH0	.EQU	0	
-INT_IM2PH1	.EQU	1	; PS2 KEYBOARD
+;INT_IM2PH1	.EQU	1
 ;INT_IM2PH2	.EQU	2
 ;INT_IM2PH3	.EQU	3
 ;INT_IM2PH4	.EQU	4
 ;INT_IM2PH5	.EQU	5
 ;INT_IM2PH6	.EQU	6
-INT_IM2PH7	.EQU	7	; HARDWARE TIMER TICK
+;INT_IM2PH7	.EQU	7
 ;
 ; MBC Z80 INTERRUPTS
 ;
@@ -799,14 +799,14 @@ INT_CTC0D	.EQU	15	; ZILOG CTC 0, CHANNEL D
 
 ; DUO IM2 PINHEADER INTERRUPTS
 
-INT_IM2PH0	.EQU	0	; HARDWARE TIMER TICK	
+;INT_IM2PH0	.EQU	0
 ;INT_IM2PH1	.EQU	1
 ;INT_IM2PH2	.EQU	2
 ;INT_IM2PH3	.EQU	3
 ;INT_IM2PH4	.EQU	4
 ;INT_IM2PH5	.EQU	5
 ;INT_IM2PH6	.EQU	6
-INT_IM2PH7	.EQU	7	; PCF I2C
+;INT_IM2PH7	.EQU	7
 ;
 ; DUO Z80 IM2 INTERRUPTS
 ;