diff --git a/Source/HBIOS/Config/SBC_std.asm b/Source/HBIOS/Config/SBC_std.asm
index 6189daea..4053ed3f 100644
--- a/Source/HBIOS/Config/SBC_std.asm
+++ b/Source/HBIOS/Config/SBC_std.asm
@@ -43,3 +43,52 @@ SDENABLE	.SET	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
 SDMODE		.SET	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC]
 ;
 PRPENABLE	.SET	TRUE		; PRP: ENABLE ECB PROPELLER IO BOARD DRIVER (PRP.ASM)
+;
+;==================================================================================================
+;   ENABLE DRIVER DEBUGGING - REMOVE ; TO ENABLE
+;==================================================================================================
+;
+;#DEFINE acia acia	
+;#DEFINE asci asci
+;#DEFINE ay38910 ay38910
+;#DEFINE bqrtc bqrtc
+;#DEFINE ctc ctc
+;#DEFINE cvdu cvdu
+;;#DEFINE dma dma			; Not working
+;#DEFINE ds7rtc ds7rtc
+;#DEFINE ds1501rt ds1501rtc
+;#DEFINE dsky dsky
+;#DEFINE dskyng dskyng
+;#DEFINE dsrtc dsrtc
+;#DEFINE duart duart
+;#DEFINE fd fd
+;#DEFINE gdc gdc
+;#DEFINE hdsk hdsk
+;#DEFINE ide ide
+;#DEFINE intrtc intrtc
+;#DEFINE kbd kbd
+;#DEFINE kio kio
+;#DEFINE lpt lpt
+;#DEFINE md md
+;#DEFINE mky mky
+;#DEFINE pcf8584 pcf8584
+;#DEFINE pio pio
+;#DEFINE ppide ppide
+;#DEFINE ppk ppk
+;#DEFINE ppp ppp
+;#DEFINE prp prp
+;#DEFINE rf rf
+;#DEFINE rp5rtc rp5rtc
+;#DEFINE sd sd
+;#DEFINE simrtc simrtc
+;#DEFINE sio sio
+;#DEFINE sn76489 sn76489
+;#DEFINE spk spk
+;#DEFINE tms tms
+;#DEFINE uart uart
+;#DEFINE uf uf
+;#DEFINE vdu vdu
+;#DEFINE vga vga
+;#DEFINE ym2612 ym2612
+;#DEFINE z2u z2u
+;
\ No newline at end of file
diff --git a/Source/HBIOS/ctc.asm b/Source/HBIOS/ctc.asm
index c98924df..5e22f31b 100644
--- a/Source/HBIOS/ctc.asm
+++ b/Source/HBIOS/ctc.asm
@@ -173,7 +173,7 @@ CTC_PRTCFG1:
 	PRTS("TIM256$")
   #ENDIF
 ;
-  #IF (CTCDEBUG)
+  #IF (DEBUG_ON)
 	PRTS(" DIVHI=$")
 	LD	A,CTC_DIVHI & $FF
 	CALL	PRTHEXBYTE
diff --git a/Source/HBIOS/hbios.inc b/Source/HBIOS/hbios.inc
index 070ea949..d0d59a42 100644
--- a/Source/HBIOS/hbios.inc
+++ b/Source/HBIOS/hbios.inc
@@ -156,56 +156,6 @@ ERR_TIMEOUT		.EQU	-11	; DEVICE TIMEOUT
 ERR_BADCFG		.EQU	-12	; INVALID CONFIGURATION
 ERR_INTERNAL		.EQU	-13	; INTERNAL ERROR
 ;
-; DEBUG DRIVER IDENTIFIERS
-;
-DRV_ID_NONE		.EQU	0
-DRV_ID_ACIA		.EQU	1
-DRV_ID_ASCI		.EQU	2
-DRV_ID_AY38910		.EQU	3
-DRV_ID_BQRTC		.EQU	4
-DRV_ID_CTC		.EQU	5
-DRV_ID_CVDU		.EQU	6
-DRV_ID_DMA		.EQU	7
-DRV_ID_DS7RTC		.EQU	8
-DRV_ID_DS1501RTC	.EQU	9
-DRV_ID_DSKY		.EQU	10
-DRV_ID_DSKYNG		.EQU	11
-DRV_ID_DSRTC		.EQU	12
-DRV_ID_DUART		.EQU	13
-DRV_ID_FD		.EQU	14
-DRV_ID_GDC		.EQU	15
-DRV_ID_HDSK		.EQU	16
-DRV_ID_IDE		.EQU	17
-DRV_ID_INTRTC		.EQU	18
-DRV_ID_KBD		.EQU	19
-DRV_ID_KIO		.EQU	20
-DRV_ID_LPT		.EQU	21
-DRV_ID_MD		.EQU	22
-DRV_ID_MKY		.EQU	23
-DRV_ID_PCF8584		.EQU	24
-DRV_ID_PIO		.EQU	25
-DRV_ID_PPIDE		.EQU	26
-DRV_ID_PPK		.EQU	27
-DRV_ID_PPP		.EQU	28
-DRV_ID_PRP		.EQU	29
-DRV_ID_RF		.EQU	30
-DRV_ID_RP5RTC		.EQU	31
-DRV_ID_SD		.EQU	32
-DRV_ID_SIMRTC		.EQU	33
-DRV_ID_SIO		.EQU	34
-DRV_ID_SN76489		.EQU	35
-DRV_ID_SPK		.EQU	36
-DRV_ID_TMS		.EQU	37
-DRV_ID_UART		.EQU	38
-DRV_ID_UF		.EQU	39
-DRV_ID_VDU		.EQU	40
-DRV_ID_VGA		.EQU	41
-DRV_ID_YM2612		.EQU	42
-DRV_ID_Z2U		.EQU	43
-;
-DEBUG_DRV		.EQU	DRV_ID_NONE
-THIS_DRV		.EQU	-DEBUG_DRV
-;
 ; HBIOS DIAG OPTIONS
 ;
 DIAG_PROG	.EQU	0		; PROGRESS BAR
diff --git a/Source/HBIOS/ym2612.asm b/Source/HBIOS/ym2612.asm
index 06d61e35..9346de1a 100644
--- a/Source/HBIOS/ym2612.asm
+++ b/Source/HBIOS/ym2612.asm
@@ -10,8 +10,6 @@
 ; 
 ;======================================================================
 ;
-THIS_DRV	.SET	DRV_ID_YM2612
-;
 YMSEL		.EQU	VGMBASE+00H		; Primary YM2162 11000000 a1=0 a0=0
 YMDAT		.EQU	VGMBASE+01H		; Primary YM2162 11000001 a1=0 a0=1
 YM2SEL		.EQU	VGMBASE+02H		; Secondary YM2162 11000010 a1=1 a0=0