diff --git a/Source/HBIOS/acia.asm b/Source/HBIOS/acia.asm
index f2c2671f..f670298c 100644
--- a/Source/HBIOS/acia.asm
+++ b/Source/HBIOS/acia.asm
@@ -49,8 +49,6 @@
 ;               1 0 - DIVIDE BY 64
 ;               1 1 - MASTER RESET
 ;
-THIS_DRV	.SET	DRV_ID_ACIA
-;
 ACIA_BUFSZ      .EQU    32              ; RECEIVE RING BUFFER SIZE
 ;
 ACIA_NONE       .EQU    0
@@ -375,7 +373,7 @@ ACIA_INITDEV:
 ;
 ACIA_INITDEVX:
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (ACIADEBUG)
         CALL    NEWLINE
         PRTS("ACIA$")
         LD      A,(IY+2)
@@ -397,7 +395,7 @@ ACIA_INITDEVX:
 ACIA_INITDEV1:
         LD      (ACIA_NEWCFG),DE        ; SAVE NEW CONFIG
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (ACIADEBUG)
         PUSH    DE
         POP     BC
         PRTS(" CFG=$")
@@ -411,7 +409,7 @@ ACIA_INITDEV1:
         LD      A,D                     ; GET CONFIG MSB
         AND     $1F                     ; ISOLATE ENCODED BAUD RATE
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (ACIADEBUG)
         PRTS(" ENC=$")
         CALL    PRTHEXBYTE
 #ENDIF
@@ -459,7 +457,7 @@ ACIA_INITDEV1:
 ;
 ACIA_INITFAIL:
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (ACIADEBUG)
         PRTS(" BAD CFG$")        
 #ENDIF
 ;
@@ -515,7 +513,7 @@ ACIA_INITGO:
 ;
         LD      (ACIA_CMD),A            ; SAVE SHADOW REGISTER
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (ACIADEBUG)
         PRTS(" CMD=$")
         CALL    PRTHEXBYTE
         LD      DE,65
diff --git a/Source/HBIOS/asci.asm b/Source/HBIOS/asci.asm
index 03cfc827..2d118f7b 100644
--- a/Source/HBIOS/asci.asm
+++ b/Source/HBIOS/asci.asm
@@ -64,8 +64,6 @@
 ; | +-------------- DCD0 DISABLE
 ; +---------------- RDRF INT INHIBIT
 ;
-THIS_DRV	.SET	DRV_ID_ASCI
-;
 ASCI_BUFSZ	.EQU	32		; RECEIVE RING BUFFER SIZE
 ;
 ASCI_NONE	.EQU	0		; NOT PRESENT
diff --git a/Source/HBIOS/audio.inc b/Source/HBIOS/audio.inc
index 109e2cb3..f821e2cc 100644
--- a/Source/HBIOS/audio.inc
+++ b/Source/HBIOS/audio.inc
@@ -1,4 +1,4 @@
-#IF (DEBUG_DRV==THIS_DRV)
+#IF AUDIOTRACE
 #DEFINE	AUDTRACE(STR)	PUSH DE \ LD DE, STR \ CALL WRITESTR \ POP DE
 #DEFINE AUDTRACE_A	CALL PRTHEXBYTE
 #DEFINE AUDTRACE_B	PUSH AF \ LD A, B \ CALL PRTHEXBYTE \ POP AF
diff --git a/Source/HBIOS/ay38910.asm b/Source/HBIOS/ay38910.asm
index ef55396a..c591e3b8 100644
--- a/Source/HBIOS/ay38910.asm
+++ b/Source/HBIOS/ay38910.asm
@@ -4,9 +4,6 @@
 ;
 ;======================================================================
 ;
-;
-THIS_DRV	.SET	DRV_ID_AY38910
-;
 ; @3.579545 OCTAVE RANGE IS 2 - 7 (Bb2/A#2 .. A7)
 ; @4.000000 OCTAVE RANGE IS 2 - 7 (B2 .. A7)
 ;
@@ -601,7 +598,7 @@ AY_PENDING_DURATION	.DW	0	; PENDING DURATION (16 BITS)
 AY_READY		.DB	0	; BIT 0 -> NZ DRIVER IS READY TO RECEIVE PLAY COMMAND
 					; BIT 1 -> NZ EXECUTING WITHIN TIMER HANDLER = DO NOT DIS/ENABLE INT
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF AUDIOTRACE
 AYT_INIT		.DB	"\r\nAY_INIT\r\n$"
 AYT_VOLOFF		.DB	"\r\nAY_VOLUME OFF\r\n$"
 AYT_VOL			.DB	"\r\nAY_VOLUME: $"
diff --git a/Source/HBIOS/ctc.asm b/Source/HBIOS/ctc.asm
index 01d2b76c..c98924df 100644
--- a/Source/HBIOS/ctc.asm
+++ b/Source/HBIOS/ctc.asm
@@ -5,8 +5,6 @@
 ;   DISPLAY CONFIGURATION DETAILS
 ;______________________________________________________________________________________________________________________
 ;
-THIS_DRV	.SET	DRV_ID_CTC
-;
 CTC_DEFCFG	.EQU	%01010011	; CTC DEFAULT CONFIG
 CTC_CTRCFG	.EQU	%01010111	; CTC COUNTER MODE CONFIG
 CTC_TIM16CFG	.EQU	%00010111	; CTC TIMER/16 MODE CONFIG
@@ -175,7 +173,7 @@ CTC_PRTCFG1:
 	PRTS("TIM256$")
   #ENDIF
 ;
-  #IF (DEBUG_DRV==THIS_DRV)
+  #IF (CTCDEBUG)
 	PRTS(" DIVHI=$")
 	LD	A,CTC_DIVHI & $FF
 	CALL	PRTHEXBYTE
diff --git a/Source/HBIOS/cvdu.asm b/Source/HBIOS/cvdu.asm
index 45d9d61c..b0dd0b7b 100644
--- a/Source/HBIOS/cvdu.asm
+++ b/Source/HBIOS/cvdu.asm
@@ -16,8 +16,6 @@
 ; CVDU DRIVER - CONSTANTS
 ;======================================================================
 ;
-THIS_DRV	.SET	DRV_ID_CVDU
-;
 CVDU_BASE	.EQU	$E0
 ;
 #IF (CVDUMODE == CVDUMODE_ECB)
diff --git a/Source/HBIOS/dma.asm b/Source/HBIOS/dma.asm
index 7dcbdb1a..9e61e02d 100644
--- a/Source/HBIOS/dma.asm
+++ b/Source/HBIOS/dma.asm
@@ -2,7 +2,6 @@
 ; Z80 DMA DRIVER
 ;==================================================================================================
 ;
-THIS_DRV			.set	DRV_ID_DMA
 DMA_CONTINUOUS			.equ 	%10111101	; + Pulse
 DMA_BYTE			.equ 	%10011101	; + Pulse
 DMA_BURST 			.equ	%11011101	; + Pulse
@@ -315,7 +314,7 @@ DMAIn_Len 	.equ	$-DMAInCode
 ; DEBUG - READ START, DESTINATION AND COUNT REGISTERS
 ;==================================================================================================
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (0)
 ;
 DMARegDump:
 	ld	a,DMA_READ_MASK_FOLLOWS
diff --git a/Source/HBIOS/ds1501rtc.asm b/Source/HBIOS/ds1501rtc.asm
index 66c2447a..4121ebad 100644
--- a/Source/HBIOS/ds1501rtc.asm
+++ b/Source/HBIOS/ds1501rtc.asm
@@ -60,9 +60,7 @@
 ;  Day-Of-Week coded as Sunday = 1 through Saturday = 7.
 
 ; Constants
-;
-THIS_DRV		.SET	DRV_ID_DS1501RTC
-;
+
 ;By defining 2 bases, this allows some flexibility for address decoding
 DS1501NVM_BASE      .EQU    DS1501RTC_BASE + $10
 
diff --git a/Source/HBIOS/ds7rtc.asm b/Source/HBIOS/ds7rtc.asm
index b6e28a17..82987e02 100644
--- a/Source/HBIOS/ds7rtc.asm
+++ b/Source/HBIOS/ds7rtc.asm
@@ -5,8 +5,6 @@
 ;
 ;==================================================================================================
 ;
-THIS_DRV	.SET	DRV_ID_DS7RTC
-;
 DS7_OUT		.EQU	10000000B		; SELECT SQUARE WAVE FUNCTION
 DS7_SQWE	.EQU	00010000B		; ENABLE SQUARE WAVE OUTPUT
 DS7_RATE	.EQU	00000000B		; SET 1HZ OUPUT
@@ -135,7 +133,7 @@ DS7_GT0:LD	A,(HL)
 	RES	7,(HL)				; REMOVE OSCILLATOR BIT
 	POP	DE				; HL POINT TO SOURCE
 ;						; DE POINT TO DESTINATION
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (0)
 	PUSH	HL
 	PUSH	DE
 	EX	DE,HL
@@ -325,7 +323,7 @@ DS7_RL1:CALL	PCF_READI2C
 	INC	HL
 	DJNZ    DS7_RL1
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (0)
 	LD	A,8
 	LD	DE,DS7_BUF	; DISPLAY DATA READ
 	CALL	PRTHEXBUF	; 
diff --git a/Source/HBIOS/dsky.asm b/Source/HBIOS/dsky.asm
index cdfc0864..c0da58e7 100644
--- a/Source/HBIOS/dsky.asm
+++ b/Source/HBIOS/dsky.asm
@@ -3,7 +3,7 @@
 ; DSKY (DISPLAY AND KEYBOARD) ROUTINES 
 ;==================================================================================================
 ;
-; THE DSKY MAY COINSIDE ON THE SAME PPI BUS AS A PPISD.  IT MAY NOT
+; THE DSKY MAY COINCIDE ON THE SAME PPI BUS AS A PPISD.  IT MAY NOT
 ; SHARE A PPI BUS WITH A PPIDE.  SEE PPI_BUS.TXT FOR MORE INFORMATION.
 ;
 ; LED SEGMENTS (BIT VALUES)
@@ -27,8 +27,6 @@
 ; PB0 |	 $01 [FW]   $41 [0]    $81 [BK]	  $C1 [CL]
 ;
 ;
-THIS_DRV	.SET	DRV_ID_DSKY
-;
 PPIA		.EQU 	DSKYPPIBASE + 0	; PORT A
 PPIB		.EQU 	DSKYPPIBASE + 1	; PORT B
 PPIC		.EQU 	DSKYPPIBASE + 2	; PORT C
diff --git a/Source/HBIOS/dskyng.asm b/Source/HBIOS/dskyng.asm
index d9d54ea9..fde11a51 100644
--- a/Source/HBIOS/dskyng.asm
+++ b/Source/HBIOS/dskyng.asm
@@ -39,9 +39,6 @@
 ;	10      10      10      10	10
 ;	20      20      20      20	20	L1	L2 	BUZZ
 ;
-;
-THIS_DRV	.SET	DRV_ID_DSKYNG
-;
 PPIA		.EQU 	DSKYPPIBASE + 0	; PORT A
 PPIB		.EQU 	DSKYPPIBASE + 1	; PORT B
 PPIC		.EQU 	DSKYPPIBASE + 2	; PORT C
diff --git a/Source/HBIOS/dsrtc.asm b/Source/HBIOS/dsrtc.asm
index 7a42bbd5..be29dc5e 100644
--- a/Source/HBIOS/dsrtc.asm
+++ b/Source/HBIOS/dsrtc.asm
@@ -89,9 +89,6 @@
 ; D1	----	--	--	--	--	--	--	--	--		CLKSEL	--
 ; D0	RTC_IN	RTC_IN	RTC_IN	RTC_IN	RTC_IN	RTC_IN	--	--	RTC_IN		RTC_IN	RTC_IN
 ;
-;
-THIS_DRV	.SET	DRV_ID_DSRTC
-;
 #IF (DSRTCMODE == DSRTCMODE_STD)
 ;
 DSRTC_IO	.EQU	RTCIO		; RTC PORT
diff --git a/Source/HBIOS/duart.asm b/Source/HBIOS/duart.asm
index a966ed78..f49182be 100644
--- a/Source/HBIOS/duart.asm
+++ b/Source/HBIOS/duart.asm
@@ -70,7 +70,7 @@
 ;		8-F = LENGTHS OF 0-7 PLUS ONE
 ;		IF BITS/CHAR = 5 THEN ADD AN ADDITIONAL HALF BIT
 ;
-THIS_DRV		.SET	DRV_ID_DUART
+DUART_DEBUG		.EQU	FALSE
 ;
 DUART_NONE		.EQU	0		; UNKNOWN OR NOT PRESENT
 DUART_2681		.EQU	1		; OLD '681 WITHOUT IVR/GPR
diff --git a/Source/HBIOS/fd.asm b/Source/HBIOS/fd.asm
index 301e5a6e..17de8693 100644
--- a/Source/HBIOS/fd.asm
+++ b/Source/HBIOS/fd.asm
@@ -5,7 +5,6 @@
 ;
 ; TODO:
 ;
-THIS_DRV	.SET	DRV_ID_FD
 ;
 ; PORTS
 ;
diff --git a/Source/HBIOS/gdc.asm b/Source/HBIOS/gdc.asm
index 8b9e881c..8ddd7603 100644
--- a/Source/HBIOS/gdc.asm
+++ b/Source/HBIOS/gdc.asm
@@ -6,8 +6,6 @@
 ; GDC DRIVER - CONSTANTS
 ;======================================================================
 ;
-THIS_DRV	.SET	DRV_ID_GDC
-;
 #IF (GDCMODE == GDCMODE_ECB)
 GDC_BASE	.EQU	$??		; GDC BASE I/O PORT
 GDC_DAC_BASE	.EQU	$??		; RAMDAC BASE I/O PORT
diff --git a/Source/HBIOS/hdsk.asm b/Source/HBIOS/hdsk.asm
index 6daf504e..172595a6 100644
--- a/Source/HBIOS/hdsk.asm
+++ b/Source/HBIOS/hdsk.asm
@@ -3,8 +3,6 @@
 ;   HDSK DISK DRIVER
 ;==================================================================================================
 ;
-THIS_DRV		.SET	DRV_ID_HDSK
-;
 ; IO PORT ADDRESSES
 ;
 HDSK_IO		.EQU	$FD
diff --git a/Source/HBIOS/ide.asm b/Source/HBIOS/ide.asm
index e19c2e58..582ade02 100644
--- a/Source/HBIOS/ide.asm
+++ b/Source/HBIOS/ide.asm
@@ -105,8 +105,6 @@
 ;	SRST:	SOFTWARE RESET
 ;	~IEN:	INTERRUPT ENABLE
 ;
-THIS_DRV		.SET	DRV_ID_IDE
-;
 IDE_REG_DATA	.EQU	$00	; DATA 	/OUTPUT (R/W)
 IDE_REG_ERR	.EQU	$01	; ERROR REGISTER (R)
 IDE_REG_FEAT	.EQU	$01	; FEATURES REGISTER (W)
diff --git a/Source/HBIOS/intrtc.asm b/Source/HBIOS/intrtc.asm
index c90d8861..cbb2184f 100644
--- a/Source/HBIOS/intrtc.asm
+++ b/Source/HBIOS/intrtc.asm
@@ -3,8 +3,6 @@
 ; SYSTEM TIMER BASED CLOCK DRIVER
 ;==================================================================================================
 ;
-THIS_DRV		.SET	DRV_ID_INTRTC
-;
 INTRTC_BUFSIZ	.EQU	6	; SIX BYTE BUFFER (YYMMDDHHMMSS)
 ;
 ; RTC DEVICE INITIALIZATION ENTRY
diff --git a/Source/HBIOS/kbd.asm b/Source/HBIOS/kbd.asm
index 9fb3825d..4ae36c51 100644
--- a/Source/HBIOS/kbd.asm
+++ b/Source/HBIOS/kbd.asm
@@ -11,8 +11,6 @@
 ;__________________________________________________________________________________________________
 ; DATA CONSTANTS
 ;__________________________________________________________________________________________________
-
-THIS_DRV		.SET	DRV_ID_KBD
 ;
 ; DRIVER DATA OFFSETS (FROM IY)
 ;
diff --git a/Source/HBIOS/kio.asm b/Source/HBIOS/kio.asm
index 904ed28c..8c7867c7 100644
--- a/Source/HBIOS/kio.asm
+++ b/Source/HBIOS/kio.asm
@@ -5,7 +5,7 @@
 ;   DISPLAY CONFIGURATION DETAILS
 ;______________________________________________________________________________________________________________________
 ;
-THIS_DRV	.SET	DRV_ID_KIO
+;
 ;
 KIO_PIOADAT	.EQU	KIOBASE + $00
 KIO_PIOACMD	.EQU	KIOBASE + $01
diff --git a/Source/HBIOS/lpt.asm b/Source/HBIOS/lpt.asm
index f683c13d..2c007389 100644
--- a/Source/HBIOS/lpt.asm
+++ b/Source/HBIOS/lpt.asm
@@ -30,8 +30,6 @@
 ;     | STAT1 | STAT0 | ENBL  | PINT  | SEL   | RES   | LF    | STB   |
 ;     +-------+-------+-------+-------+-------+-------+-------+-------+
 ;
-THIS_DRV	.SET	DRV_ID_LPT
-;
 LPT_NONE	.EQU	0		; NOT PRESENT
 LPT_IBM		.EQU	1		; IBM PC STYLE INTERFACE
 ;
diff --git a/Source/HBIOS/md.asm b/Source/HBIOS/md.asm
index 9418f5b7..8277468e 100644
--- a/Source/HBIOS/md.asm
+++ b/Source/HBIOS/md.asm
@@ -12,8 +12,6 @@
 ;	0x00 MEMORY DISK	0x01 ROM DRIVE		%00100000 HD STYLE, NON-REMOVABLE, TYPE-ROM
 ;	0x00 MEMORY DISK	0x01 ROM DRIVE		%00111000 HD STYLE, NON-REMOVABLE, TYPE-FLASH
 ;
-THIS_DRV	.SET	DRV_ID_MD
-;
 ;MD_DEVCNT	.EQU	2		; NUMBER OF MD DEVICES SUPPORTED
 MD_CFGSIZ	.EQU	8		; SIZE OF CFG TBL ENTRIES
 ;
diff --git a/Source/HBIOS/mky.asm b/Source/HBIOS/mky.asm
index df82fe29..0a86dd16 100644
--- a/Source/HBIOS/mky.asm
+++ b/Source/HBIOS/mky.asm
@@ -27,8 +27,6 @@
 ; DRIVER - CONSTANTS
 ;======================================================================
 ;
-THIS_DRV		.SET	DRV_ID_MKY
-;
 MKY_REGA		.EQU	$A8
 MKY_REGB		.EQU	$A9
 MKY_REGC		.EQU	$AA
diff --git a/Source/HBIOS/pcf8584.asm b/Source/HBIOS/pcf8584.asm
index 59316d70..54dfe6a4 100644
--- a/Source/HBIOS/pcf8584.asm
+++ b/Source/HBIOS/pcf8584.asm
@@ -2,8 +2,6 @@
 ; PCF8584 I2C CLOCK DRIVER
 ;==================================================================================================
 ;
-THIS_DRV	.SET	DRV_ID_PCF8584
-;
 PCF_BASE  	.EQU  0F0H
 PCF_ID   	.EQU  0AAH
 CPU_CLK	  	.EQU  12
@@ -472,7 +470,7 @@ PCF_PRTERR:
 ;-----------------------------------------------------------------------------
 ; DEBUG HELPER
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (1)
 PCF_DBG:
 	PUSH	AF
 	PUSH 	DE
diff --git a/Source/HBIOS/pio.asm b/Source/HBIOS/pio.asm
index 16b962c4..8f4cd520 100644
--- a/Source/HBIOS/pio.asm
+++ b/Source/HBIOS/pio.asm
@@ -14,8 +14,6 @@
 ; IF IT EXISTS.  FOR NOW, IT DOES NOT REGISTER ANY OF THE PIO CHANNELS
 ; AS CHARCTER DEVICE UNITS.
 ;
-THIS_DRV		.SET	DRV_ID_PIO
-;
 PIO_NONE	.EQU	0
 PIO_PIO		.EQU	1
 ;
diff --git a/Source/HBIOS/ppide.asm b/Source/HBIOS/ppide.asm
index 14400895..fd55cb1c 100644
--- a/Source/HBIOS/ppide.asm
+++ b/Source/HBIOS/ppide.asm
@@ -20,8 +20,6 @@
 ; IT IS DRIVING THE ADDRESS BUS AND CONTROL SIGNALS.  PORTS A & B WILL BE
 ; PLACED IN READ OR WRITE MODE DEPENDING ON THE DIRECTION OF THE DATA BUS.
 ;
-THIS_DRV	.SET	DRV_ID_PPIDE
-;
 PPIDE_DIR_READ	.EQU	%10010010	; IDE BUS DATA INPUT MODE
 PPIDE_DIR_WRITE	.EQU	%10000000	; IDE BUS DATA OUTPUT MODE
 ;
diff --git a/Source/HBIOS/ppk.asm b/Source/HBIOS/ppk.asm
index d1d84230..6672782b 100644
--- a/Source/HBIOS/ppk.asm
+++ b/Source/HBIOS/ppk.asm
@@ -12,8 +12,6 @@
 ; DATA CONSTANTS
 ;__________________________________________________________________________________________________
 ;
-THIS_DRV	.SET	DRV_ID_PPK
-;
 ; DRIVER DATA OFFSETS (FROM IY)
 ;
 PPK_PPIA	.EQU	0	; PPI PORT A
diff --git a/Source/HBIOS/ppp.asm b/Source/HBIOS/ppp.asm
index b85e7598..b5d740e6 100644
--- a/Source/HBIOS/ppp.asm
+++ b/Source/HBIOS/ppp.asm
@@ -6,8 +6,6 @@
 ; TODO:
 ;   1) ADD SUPPORT FOR DSKY
 ;
-THIS_DRV	.SET	DRV_ID_PPP
-;
 PPP_IO		.EQU	PPPBASE + 0	; PPP DATA I/O (PPI PORT A)
 PPP_CTL		.EQU	PPPBASE + 2	; PPP CTL LINES (PPI PORT C)
 PPP_PPICTL	.EQU	PPPBASE + 3	; PPI CONTROL PORT
diff --git a/Source/HBIOS/prp.asm b/Source/HBIOS/prp.asm
index 92389e93..92bea67a 100644
--- a/Source/HBIOS/prp.asm
+++ b/Source/HBIOS/prp.asm
@@ -6,8 +6,6 @@
 ; TODO:
 ;   1) ADD SUPPORT FOR DSKY
 ;
-THIS_DRV	.SET	DRV_ID_PRP
-;
 PRP_IOBASE	.EQU	$A8
 ;
 ; GLOBAL PROPIO INITIALIZATION
diff --git a/Source/HBIOS/rf.asm b/Source/HBIOS/rf.asm
index bceab08b..17aa5305 100644
--- a/Source/HBIOS/rf.asm
+++ b/Source/HBIOS/rf.asm
@@ -3,7 +3,7 @@
 ;   RAM FLOPPY DISK DRIVER
 ;==================================================================================================
 ;
-THIS_DRV	.SET	DRV_ID_RF
+;
 ;
 RF_U0IO		.EQU	$A0		; BASED ADDRESS OF RAMFLOPPY 1
 RF_U1IO		.EQU	$A4		; BASED ADDRESS OF RAMFLOPPY 2
diff --git a/Source/HBIOS/rp5rtc.asm b/Source/HBIOS/rp5rtc.asm
index ff78f93d..df74a42d 100644
--- a/Source/HBIOS/rp5rtc.asm
+++ b/Source/HBIOS/rp5rtc.asm
@@ -3,8 +3,6 @@
 ; RP5C01 CLOCK DRIVER
 ;==================================================================================================
 ;
-THIS_DRV		.SET	DRV_ID_RP5RTC
-;
 RP5RTC_BUFSIZ	.EQU	6	; SIX BYTE BUFFER (YYMMDDHHMMSS)
 ;
 ; RTC DEVICE INITIALIZATION ENTRY
diff --git a/Source/HBIOS/sd.asm b/Source/HBIOS/sd.asm
index 27f99f6b..360e823b 100644
--- a/Source/HBIOS/sd.asm
+++ b/Source/HBIOS/sd.asm
@@ -81,8 +81,6 @@
 ;
 ;------------------------------------------------------------------------------
 ;
-THIS_DRV	.SET	DRV_ID_SD
-;
 ; *** HACK FOR MISSING PULLUP RESISTORS ***
 ;
 ; THERE IS A RECENT TREND FOR SD ADAPTER BOARDS (SUCH AS THOSE USED TO ATTACH AN
diff --git a/Source/HBIOS/simrtc.asm b/Source/HBIOS/simrtc.asm
index 79c023c2..521b806d 100644
--- a/Source/HBIOS/simrtc.asm
+++ b/Source/HBIOS/simrtc.asm
@@ -3,8 +3,6 @@
 ; SIMH RTC DRIVER
 ;==================================================================================================
 ;
-THIS_DRV		.SET	DRV_ID_SIMRTC
-;
 SIMRTC_IO	.EQU	$FE	; SIMH IO PORT
 SIMRTC_CLKREAD	.EQU	7	; READ CLOCK COMMAND
 SIMRTC_CLKWRITE	.EQU	8	; WRITE CLOCK COMMAND
diff --git a/Source/HBIOS/sio.asm b/Source/HBIOS/sio.asm
index efd9f5cf..4342d9f2 100644
--- a/Source/HBIOS/sio.asm
+++ b/Source/HBIOS/sio.asm
@@ -16,8 +16,6 @@
 ; 
 ; SIO PORT A (COM1:) and SIO PORT B (COM2:) ARE MAPPED TO DEVICE UC1: AND UL1: IN CP/M.
 ;
-THIS_DRV	.SET	DRV_ID_SIO
-;
 SIO_BUFSZ	.EQU	32		; RECEIVE RING BUFFER SIZE
 ;
 SIO_NONE	.EQU	0
@@ -474,7 +472,7 @@ SIO_INITDEVX:
 ; THIS ENTRY POINT BYPASSES DISABLING/ENABLING INTS WHICH IS REQUIRED BY
 ; PREINIT ABOVE.  PREINIT IS NOT ALLOWED TO ENABLE INTS!
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	CALL	NEWLINE
 	PRTS("SIO$")
 	LD	A,(IY+2)
@@ -499,7 +497,7 @@ SIO_INITDEVX:
 ;
 SIO_INITDEV1:
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PUSH	DE
 	POP	BC
 	PRTS(" CFG=$")
@@ -524,7 +522,7 @@ SIO_INITDEV1:
 	LD	C,75			; DIVIDE BY 75 LIKE BAUD RATE
 	CALL	DIV32X8			; HL NOW HAS (CLK / 75)
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PRTS(" CLK75=$")
 	CALL	PRTHEX32
 #ENDIF
@@ -544,7 +542,7 @@ SIO_INITDEV1A:
 	JR	SIO_INITDEV1A		; AND LOOP
 SIO_INITDEV1B:
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PRTS(" CLK=$")
 	CALL	PRTHEX32
 #ENDIF
@@ -563,7 +561,7 @@ SIO_INITDEV1B:
 	LD	DE,1			; USE 1 FOR ENCODING CONSTANT
 	CALL	DECODE			; DE:HL := BAUD RATE, ERRORS IGNORED
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PRTS(" BAUD75=$")
 	CALL	PRTHEX32
 #ENDIF
@@ -581,7 +579,7 @@ SIO_INITDEV1C:
 	DJNZ	SIO_INITDEV1C		; LOOP UNTIL DONE SHIFTING
 SIO_INITDEV1D:
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PRTS(" BAUD=$")
 	CALL	PRTHEX32
 #ENDIF
@@ -591,7 +589,7 @@ SIO_INITDEV1D:
 	; *** HANDLE DIVIDE BY ZERO??? ***
 	CALL	DIV16			; BC := HL/DE == TARGET DIVISOR
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PRTS(" DIV=$")
 	CALL	PRTHEXWORD
 #ENDIF
@@ -636,7 +634,7 @@ SIO_INITDEV1D:
 	
 	; *** CHECK FOR CARRY??? ***
 ;
-  #IF (DEBUG_DRV==THIS_DRV)
+  #IF (SIODEBUG)
 	PRTS(" DIV=$")
 	CALL	PRTHEXWORD
   #ENDIF
@@ -691,7 +689,7 @@ SIO_INITDEV4:
 ;
 	POP	DE			; RESTORE DE = SERIAL CONFIG
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PUSH	BC
 	PUSH	HL
 	POP	BC
@@ -719,7 +717,7 @@ SIO_INITDEV4:
 	; ALL GOOD.  PROGRAM THE CTC CHANNEL
 	LD	A,(IY+13)		; GET CTC CHANNEL
 	ADD	A,CTCBASE		; ADD TO CTC BASE PORT ADR
-  #IF (DEBUG_DRV==THIS_DRV)
+  #IF (SIODEBUG)
 	PRTS(" CTC=$")
 	CALL	PRTHEXBYTE
   #ENDIF
@@ -748,7 +746,7 @@ SIO_NOCTC:
 ;
 SIO_INITFAIL:
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	PRTS(" BAD CFG$")	
 #ENDIF
 ;
@@ -853,7 +851,7 @@ SIO_INITIVT:
 ;
 #ENDIF
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (SIODEBUG)
 	LD	HL,SIO_INITVALS
 	LD	B,SIO_INITLEN/2
 SIO_INITPRT:
diff --git a/Source/HBIOS/sn76489.asm b/Source/HBIOS/sn76489.asm
index 423c6ebc..b05bba74 100644
--- a/Source/HBIOS/sn76489.asm
+++ b/Source/HBIOS/sn76489.asm
@@ -12,8 +12,6 @@
 ; CONSTANTS
 ;======================================================================
 ;
-THIS_DRV		.SET	DRV_ID_SN76489
-;
 #IF (PLATFORM == PLT_SBC) & (SNMODE == SNMODE_VGM)
 SN76489_PORT_LEFT	.EQU	$C6	; PORTS FOR ACCESSING THE SN76489 CHIP (LEFT)
 SN76489_PORT_RIGHT	.EQU	$C7	; PORTS FOR ACCESSING THE SN76489 CHIP (RIGHT)
@@ -401,7 +399,7 @@ SN7_PENDING_DURATION
 STR_MESSAGELT	.DB	"\r\nSN76489: LEFT IO=0x$"
 STR_MESSAGERT	.DB	", RIGHT IO=0x$"
 
-#IF (DEBUG_DRV==THIS_DRV)
+#IF AUDIOTRACE
 SNT_INIT		.DB	"\r\nSN7_INIT\r\n$"
 SNT_VOLOFF		.DB	"\r\nSN7_VOLUME OFF\r\n$"
 SNT_VOL			.DB	"\r\nSN7_VOLUME: $"
diff --git a/Source/HBIOS/spk.asm b/Source/HBIOS/spk.asm
index 2bea8271..ee3b803c 100644
--- a/Source/HBIOS/spk.asm
+++ b/Source/HBIOS/spk.asm
@@ -10,8 +10,6 @@
 ;			NO VOLUME ADJUSTMENT DUE TO HARDWARE LIMITATION
 ;======================================================================
 ;
-THIS_DRV		.SET	DRV_ID_SPK
-;
 ;	DRIVER FUNCTION TABLE AND INSTANCE DATA
 ;
 SP_FNTBL:
diff --git a/Source/HBIOS/tms.asm b/Source/HBIOS/tms.asm
index e766a50a..90a7832f 100644
--- a/Source/HBIOS/tms.asm
+++ b/Source/HBIOS/tms.asm
@@ -15,8 +15,7 @@
 ; TMS DRIVER - CONSTANTS
 ;======================================================================
 ;
-THIS_DRV	.SET	DRV_ID_TMS
-;
+
 TMSCTRL1:       .EQU   1               ; CONTROL BITS
 TMSINTEN:       .EQU   5               ; INTERRUPT ENABLE BIT
 
diff --git a/Source/HBIOS/uart.asm b/Source/HBIOS/uart.asm
index 4ca9984a..c8e0b9b2 100644
--- a/Source/HBIOS/uart.asm
+++ b/Source/HBIOS/uart.asm
@@ -18,7 +18,7 @@
 ;              -- MCR --                        -- LCR --
 ;
 ;
-THIS_DRV		.SET	DRV_ID_UART
+UART_DEBUG		.EQU	FALSE
 ;
 UART_BUFSZ		.EQU	32	; RECEIVE RING BUFFER SIZE
 ;
@@ -640,7 +640,7 @@ UART_INITDEV5:
 #ENDIF
 ;
 ;
-#IF (DEBUG_DRV==THIS_DRV)
+#IF (UART_DEBUG)
 	PRTS(" [$")
 	
 	; DEBUG: DUMP UART TYPE
diff --git a/Source/HBIOS/uf.asm b/Source/HBIOS/uf.asm
index 0f17cd38..049167c0 100644
--- a/Source/HBIOS/uf.asm
+++ b/Source/HBIOS/uf.asm
@@ -13,8 +13,6 @@
 ;	UF_PREINIT	SETUP THE DISPATCH TABLE ENTRY AND INITIALIZE HARDWARE	
 ;	UF_INIT		ANNOUNCE DEVICE DESCRIPTION AND PORT
 ;
-THIS_DRV	.SET	DRV_ID_UF
-;
 FIFO_DATA       .EQU	(UFBASE+0)	; READ/WRITE DATA
 FIFO_STATUS     .EQU	(UFBASE+1)	; READ/WRITE STATUS
 FIFO_SEND_IMM   .EQU	(UFBASE+2)	; WRITE PORT TO FORCE BUFFER FLUSH
diff --git a/Source/HBIOS/vdu.asm b/Source/HBIOS/vdu.asm
index 7d0f7562..0d035bf4 100644
--- a/Source/HBIOS/vdu.asm
+++ b/Source/HBIOS/vdu.asm
@@ -21,8 +21,6 @@
 ; VDU DRIVER - CONSTANTS
 ;======================================================================
 ;
-THIS_DRV	.SET	DRV_ID_VDU
-;
 VDU_BASE	.EQU	$F0
 ;
 VDU_RAMRD	.EQU	VDU_BASE + $00	; READ VDU
diff --git a/Source/HBIOS/vga.asm b/Source/HBIOS/vga.asm
index 27b792d0..d072711b 100644
--- a/Source/HBIOS/vga.asm
+++ b/Source/HBIOS/vga.asm
@@ -10,8 +10,6 @@
 ; VGA DRIVER - CONSTANTS
 ;======================================================================
 ;
-THIS_DRV	.SET	DRV_ID_VGA
-;
 VGA_BASE	.EQU	$E0
 ;
 VGA_KBDDATA	.EQU	VGA_BASE + $00	; KBD CTLR DATA PORT
diff --git a/Source/HBIOS/z2u.asm b/Source/HBIOS/z2u.asm
index ee4f308e..d4ac9ac3 100644
--- a/Source/HBIOS/z2u.asm
+++ b/Source/HBIOS/z2u.asm
@@ -56,7 +56,7 @@
 ; UNLESS FULL BLOWN INTERRUPT MODE 3 W/ NATIVE MEMORY MANAGEMENT
 ; IS BEING USED.
 ;
-THIS_DRV	.SET	DRV_ID_Z2U
+;
 ;
 #IF (Z2U0HFC)
 Z2U_BUFSZ	.EQU	32		; RECEIVE RING BUFFER SIZE