diff --git a/demos/second/hardware_detect.s b/demos/second/hardware_detect.s
index e2947f21..782b3381 100644
--- a/demos/second/hardware_detect.s
+++ b/demos/second/hardware_detect.s
@@ -39,7 +39,7 @@ not_iigs:
 	lda	#0
 	sta	SOUND_STATUS
 
-PT3_ENABLE_APPLE_IIC = 1
+;PT3_ENABLE_APPLE_IIC = 1		; we set this earlier
 
 	jsr	mockingboard_detect
 	bcc	mockingboard_notfound
diff --git a/demos/second/part00_boot/Makefile b/demos/second/part00_boot/Makefile
index 16740878..9f16d156 100644
--- a/demos/second/part00_boot/Makefile
+++ b/demos/second/part00_boot/Makefile
@@ -16,9 +16,9 @@ FAKE_BIOS:	fake_bios.o
 fake_bios.o:	fake_bios.s \
 	../hgr_clear_screen.s ../hgr_table.s \
 	font_console_1x8.s fonts/a2_cga_thin.inc \
-	pt3_lib_detect_model.s ../lc_detect.s aux_detect.s \
+	../pt3_lib_detect_model.s ../lc_detect.s aux_detect.s \
 	65c02_detect.s ../pt3_lib_mockingboard_detect.s \
-	pt3_lib_mockingboard_setup.s ../wait.s \
+	../wait.s \
 	../zx02_optim.s graphics/a2_energy.hgr.zx02
 	ca65 -o fake_bios.o fake_bios.s -l fake_bios.lst
 
diff --git a/demos/second/part00_boot/fake_bios.s b/demos/second/part00_boot/fake_bios.s
index cc599203..c790be4b 100644
--- a/demos/second/part00_boot/fake_bios.s
+++ b/demos/second/part00_boot/fake_bios.s
@@ -756,7 +756,7 @@ early_out:
 
 .include "aux_detect.s"
 .include "65c02_detect.s"
-.include "pt3_lib_mockingboard_setup.s"
+;.include "pt3_lib_mockingboard_setup.s"
 
 ;.include "pt3_lib_detect_model.s"
 ;.include "../lc_detect.s"
diff --git a/demos/second/part00_boot/pt3_lib_detect_model.s b/demos/second/part00_boot/pt3_lib_detect_model.s
deleted file mode 100644
index cccb70f5..00000000
--- a/demos/second/part00_boot/pt3_lib_detect_model.s
+++ /dev/null
@@ -1,87 +0,0 @@
-	;===========================
-	; Check Apple II model
-	;===========================
-	; this is mostly for IIc support
-	; as it does interrupts differently
-
-	; some of this info from the document:
-	; Apple II Family Identification Routines 2.2
-	;
-
-	; ' ' = Apple II
-	; '+' = Apple II+
-	; 'e' = Apple IIe
-	; 'c' = Apple IIc
-	; 'g' = Apple IIgs
-	; 'm' = mac L/C with board
-	; 'j' = jplus
-	; '3' = Apple III
-
-detect_appleii_model:
-	lda	#' '
-
-	ldx	$FBB3
-
-				; II is $38
-				; J-plus is $C9
-				; II+ is $EA (so is III)
-				; IIe and newer is $06
-
-	cpx	#$38			; ii
-	beq	done_apple_detect
-
-
-					; ii+ is EA FB1E=AD
-					; iii is EA FB1E=8A 00
-
-	cpx	#$EA
-	bne	not_ii_iii
-ii_or_iii:
-
-	lda	#'+'			; ii+/iii
-
-	ldx	$FB1E
-	cpx	#$AD
-	beq	done_apple_detect	; ii+
-
-	lda	#'3'
-	bne	done_apple_detect 	; bra iii
-
-not_ii_iii:
-	lda	#'j'			; jplus
-	cpx	#$C9
-	beq	done_apple_detect
-
-
-	cpx	#$06
-	bne	done_apple_detect
-
-apple_iie_or_newer:
-
-
-
-	ldx	$FBC0		; $EA on a IIe
-				; $E0 on a IIe enhanced
-				; $00 on a IIc/IIc+
-
-				; $FE1F = $60, IIgs
-
-	beq	apple_iic
-
-	lda	#'e'
-	cpx	#$EA
-	beq	done_apple_detect
-	cpx	#$E0
-	beq	done_apple_detect
-
-	; assume GS?
-
-	lda	#'g'
-	bne	done_apple_detect
-
-apple_iic:
-	lda	#'c'
-
-done_apple_detect:
-	sta	APPLEII_MODEL
-	rts
diff --git a/demos/second/part00_boot/pt3_lib_mockingboard_setup.s b/demos/second/part00_boot/pt3_lib_mockingboard_setup.s
deleted file mode 100644
index 1091b73e..00000000
--- a/demos/second/part00_boot/pt3_lib_mockingboard_setup.s
+++ /dev/null
@@ -1,262 +0,0 @@
-; Mockingboad programming:
-; + Has two 6522 I/O chips connected to two AY-3-8910 chips
-; + Optionally has some speech chips controlled via the outport on the AY
-; + Often in slot 4
-;	TODO: how to auto-detect?
-; References used:
-;	http://macgui.com/usenet/?group=2&id=8366
-;	6522 Data Sheet
-;	AY-3-8910 Data Sheet
-
-;========================
-; Mockingboard card
-; Essentially two 6522s hooked to the Apple II bus
-; Connected to AY-3-8910 chips
-;	PA0-PA7 on 6522 connected to DA0-DA7 on AY
-;	PB0     on 6522 connected to BC1
-;	PB1	on 6522 connected to BDIR
-;	PB2	on 6522 connected to RESET
-
-
-; left speaker
-MOCK_6522_ORB1	=	$C400	; 6522 #1 port b data
-MOCK_6522_ORA1	=	$C401	; 6522 #1 port a data
-MOCK_6522_DDRB1	=	$C402	; 6522 #1 data direction port B
-MOCK_6522_DDRA1	=	$C403	; 6522 #1 data direction port A
-MOCK_6522_T1CL	=	$C404	; 6522 #1 t1 low order latches
-MOCK_6522_T1CH	=	$C405	; 6522 #1 t1 high order counter
-MOCK_6522_T1LL	=	$C406	; 6522 #1 t1 low order latches
-MOCK_6522_T1LH	=	$C407	; 6522 #1 t1 high order latches
-MOCK_6522_T2CL	=	$C408	; 6522 #1 t2 low order latches
-MOCK_6522_T2CH	=	$C409	; 6522 #1 t2 high order counters
-MOCK_6522_SR	=	$C40A	; 6522 #1 shift register
-MOCK_6522_ACR	=	$C40B	; 6522 #1 auxilliary control register
-MOCK_6522_PCR	=	$C40C	; 6522 #1 peripheral control register
-MOCK_6522_IFR	=	$C40D	; 6522 #1 interrupt flag register
-MOCK_6522_IER	=	$C40E	; 6522 #1 interrupt enable register
-MOCK_6522_ORANH	=	$C40F	; 6522 #1 port a data no handshake
-
-
-; right speaker
-MOCK_6522_ORB2	=	$C480	; 6522 #2 port b data
-MOCK_6522_ORA2	=	$C481	; 6522 #2 port a data
-MOCK_6522_DDRB2	=	$C482	; 6522 #2 data direction port B
-MOCK_6522_DDRA2	=	$C483	; 6522 #2 data direction port A
-
-; AY-3-8910 commands on port B
-;						RESET	BDIR	BC1
-MOCK_AY_RESET		=	$0	;	0	0	0
-MOCK_AY_INACTIVE	=	$4	;	1	0	0
-MOCK_AY_READ		=	$5	;	1	0	1
-MOCK_AY_WRITE		=	$6	;	1	1	0
-MOCK_AY_LATCH_ADDR	=	$7	;	1	1	1
-
-.if 0
-	;========================
-	; Mockingboard Init
-	;========================
-	; Initialize the 6522s
-	; set the data direction for all pins of PortA/PortB to be output
-
-mockingboard_init:
-	lda	#$ff		; all output (1)
-
-mock_init_smc1:
-	sta	MOCK_6522_DDRB1
-	sta	MOCK_6522_DDRA1
-mock_init_smc2:
-	sta	MOCK_6522_DDRB2
-	sta	MOCK_6522_DDRA2
-	rts
-
-	;===================================
-	;===================================
-	; Reset Both AY-3-8910s
-	;===================================
-	;===================================
-
-	;======================
-	; Reset Left AY-3-8910
-	;======================
-reset_ay_both:
-	lda	#MOCK_AY_RESET
-reset_ay_smc1:
-	sta	MOCK_6522_ORB1
-	lda	#MOCK_AY_INACTIVE
-reset_ay_smc2:
-	sta	MOCK_6522_ORB1
-
-	;======================
-	; Reset Right AY-3-8910
-	;======================
-;reset_ay_right:
-;could be merged with both
-	lda	#MOCK_AY_RESET
-reset_ay_smc3:
-	sta	MOCK_6522_ORB2
-	lda	#MOCK_AY_INACTIVE
-reset_ay_smc4:
-	sta	MOCK_6522_ORB2
-	rts
-
-
-;	Write sequence
-;	Inactive -> Latch Address -> Inactive -> Write Data -> Inactive
-
-	;=========================================
-	; Write Right/Left to save value AY-3-8910
-	;=========================================
-	; register in X
-	; value in MB_VALUE
-
-write_ay_both:
-	; address
-
-write_ay_smc1:
-	stx	MOCK_6522_ORA1		; put address on PA1		; 4
-	stx	MOCK_6522_ORA2		; put address on PA2		; 4
-	lda	#MOCK_AY_LATCH_ADDR	; latch_address on PB1		; 2
-write_ay_smc2:
-	sta	MOCK_6522_ORB1		; latch_address on PB1		; 4
-	sta	MOCK_6522_ORB2		; latch_address on PB2		; 4
-	ldy	#MOCK_AY_INACTIVE	; go inactive			; 2
-write_ay_smc3:
-	sty	MOCK_6522_ORB1						; 4
-	sty	MOCK_6522_ORB2						; 4
-								;===========
-								;        28
-	; value
-	lda	MB_VALUE						; 3
-write_ay_smc4:
-	sta	MOCK_6522_ORA1		; put value on PA1		; 4
-	sta	MOCK_6522_ORA2		; put value on PA2		; 4
-	lda	#MOCK_AY_WRITE		;				; 2
-write_ay_smc5:
-	sta	MOCK_6522_ORB1		; write on PB1			; 4
-	sta	MOCK_6522_ORB2		; write on PB2			; 4
-write_ay_smc6:
-	sty	MOCK_6522_ORB1						; 4
-	sty	MOCK_6522_ORB2						; 4
-								;===========
-								;        29
-
-	rts								; 6
-								;===========
-								;       63
-write_ay_both_end:
-;.assert >write_ay_both = >write_ay_both_end, error, "write_ay_both crosses page"
-
-	;=======================================
-	; clear ay -- clear all 14 AY registers
-	; should silence the card
-	;=======================================
-	; 7+(74*14)+5=1048
-clear_ay_both:
-	ldx	#13				; 2
-	lda	#0				; 2
-	sta	MB_VALUE			; 3
-clear_ay_left_loop:
-	jsr	write_ay_both			; 6+63
-	dex					; 2
-	bpl	clear_ay_left_loop		; 3
-						; -1
-	rts					; 6
-
-clear_ay_end:
-;.assert >clear_ay_both = >clear_ay_end, error, "clear_ay_both crosses page"
-
-	;=============================
-	; Setup
-	;=============================
-mockingboard_setup_interrupt:
-
-
-	; for this game with things in language card including
-	; irq handler, always force IIc mode (where RAM swapped in
-	; and we put the irq handler address directly up at $FFFE)
-
-	lda	#<interrupt_handler
-	sta	$fffe
-	lda	#>interrupt_handler
-	sta	$ffff
-
-	; nop out the "lda $45" since we are bypassing the ROM irq handler
-	; that puts A in $45
-	lda	#$EA
-	sta	interrupt_smc
-	sta	interrupt_smc+1
-
-
-	;=========================
-	; Setup Interrupt Handler
-	;=========================
-	; Vector address goes to 0x3fe/0x3ff
-	; FIXME: should chain any existing handler
-
-;	lda	#<interrupt_handler
-;	sta	$03fe
-;	lda	#>interrupt_handler
-;	sta	$03ff
-
-	;============================
-	; Enable 50Hz clock on 6522
-	;============================
-
-
-	; Note, on Apple II the clock isn't 1MHz but is actually closer to
-	;       roughly 1.023MHz, and every 65th clock is stretched (it's complicated)
-
-	; 4fe7 / 1.023e6 = .020s, 50Hz
-	; 9c40 / 1.023e6 = .040s, 25Hz
-	; 411a / 1.023e6 = .016s, 60Hz
-
-	; French Touch uses
-	; 4e20 / 1.000e6 = .020s, 50Hz, which assumes 1MHz clock freq
-
-	sei			; disable interrupts just in case
-
-	lda	#$40		; Continuous interrupts, don't touch PB7
-setup_irq_smc1:
-	sta	MOCK_6522_ACR	; ACR register
-	lda	#$7F		; clear all interrupt flags
-setup_irq_smc2:
-	sta	MOCK_6522_IER	; IER register (interrupt enable)
-
-	lda	#$C0
-setup_irq_smc3:
-	sta	MOCK_6522_IFR	; IFR: 1100, enable interrupt on timer one oflow
-setup_irq_smc4:
-	sta	MOCK_6522_IER	; IER: 1100, enable timer one interrupt
-
-	lda	#$E7
-;	lda	#$20
-setup_irq_smc5:
-	sta	MOCK_6522_T1CL	; write into low-order latch
-	lda	#$4f
-;	lda	#$4E
-setup_irq_smc6:
-	sta	MOCK_6522_T1CH	; write into high-order latch,
-				; load both values into counter
-				; clear interrupt and start counting
-
-	rts
-
-
-
-	;=============================
-	; Disable Interrupt
-	;=============================
-mockingboard_disable_interrupt:
-
-	sei			; disable interrupts just in case
-
-	lda	#$40		; Continuous interrupts, don't touch PB7
-disable_irq_smc1:
-	sta	MOCK_6522_ACR	; ACR register
-	lda	#$7F		; clear all interrupt flags
-disable_irq_smc2:
-	sta	MOCK_6522_IER	; IER register (interrupt enable)
-
-	rts
-
-.endif
diff --git a/demos/second/pt3_lib_mockingboard_detect.s b/demos/second/pt3_lib_mockingboard_detect.s
index cd36df72..544eb429 100644
--- a/demos/second/pt3_lib_mockingboard_detect.s
+++ b/demos/second/pt3_lib_mockingboard_detect.s
@@ -47,7 +47,7 @@ mockingboard_detect:
 
 .ifdef PT3_ENABLE_APPLE_IIC
 	lda	APPLEII_MODEL
-	cmp	#'C'
+	cmp	#'c'
 	bne	not_iic
 
 	lda	#$ff
diff --git a/demos/second/qload.s b/demos/second/qload.s
index 6ef6260c..956ac195 100644
--- a/demos/second/qload.s
+++ b/demos/second/qload.s
@@ -205,6 +205,7 @@ length_array:
 	.byte 16,16,16,96	; CUBE,DOTS,SPHERES,OCEAN
 	.byte 16,16		; POLAR,FAKE_BIOS
 
+PT3_ENABLE_APPLE_IIC = 1
 
 	.include	"wait.s"
 
diff --git a/demos/second/qload2.s b/demos/second/qload2.s
index 796ffc78..5000843b 100644
--- a/demos/second/qload2.s
+++ b/demos/second/qload2.s
@@ -187,6 +187,8 @@ aux_address_array:
 	.include	"text_print.s"
 	.include	"gr_offsets.s"
 
+PT3_ENABLE_APPLE_IIC = 1
+
 	.include	"pt3_lib_detect_model.s"
 	.include	"pt3_lib_mockingboard_detect.s"