diff --git a/src/cpu/6502.c b/src/cpu/6502.c
index 1d13d07..3f80519 100644
--- a/src/cpu/6502.c
+++ b/src/cpu/6502.c
@@ -220,193 +220,6 @@ INLINE int m6502_Step() {
     }
 #endif
     
-#ifdef FUNCTIONTEST
-    switch ( m6502.PC ) {
-        case 0x400:
-            dbgPrintf("START...\n");
-            break;
-        
-        case 0x0438:
-            dbgPrintf2("*** TEST 1 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0581:
-            dbgPrintf2("*** TEST 2 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x05C8:
-            dbgPrintf2("*** TEST 3 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x05FC:
-            dbgPrintf2("*** TEST 4 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0776:
-            dbgPrintf2("*** TEST 5 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0872:
-            dbgPrintf2("*** TEST 6 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x08A6:
-            dbgPrintf2("*** TEST 7 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x08F0:
-            dbgPrintf2("*** TEST 8 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0946:
-            dbgPrintf2("*** TEST 9 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0982:
-            dbgPrintf2("*** TEST 10 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x09B9:
-            dbgPrintf2("*** TEST 11 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0A11:
-            dbgPrintf2("*** TEST 12 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0AB7:
-            dbgPrintf2("*** TEST 13 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0D7D:
-            dbgPrintf2("*** TEST 14 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0E46:
-            dbgPrintf2("*** TEST 15 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0F01:
-            dbgPrintf2("*** TEST 16 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0F43:
-            dbgPrintf2("*** TEST 17 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x0FFA:
-            dbgPrintf2("*** TEST 18 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x103A:
-            dbgPrintf2("*** TEST 19 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x1330:
-            dbgPrintf2("*** TEST 20 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x162A:
-            dbgPrintf2("*** TEST 21 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x16DB:
-            dbgPrintf2("*** TEST 22 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x17FA:
-            dbgPrintf2("*** TEST 23 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x1899:
-            dbgPrintf2("*** TEST 24 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x1B63:
-            dbgPrintf2("*** TEST 25 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x1CB7:
-            dbgPrintf2("*** TEST 26 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x1DC5:
-            dbgPrintf("*** TEST 27 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x1ED3:
-            dbgPrintf2("*** TEST 28 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x22B7:
-            dbgPrintf2("*** TEST 29 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x23FB:
-            dbgPrintf2("*** TEST 30 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x257B:
-            dbgPrintf2("*** TEST 31 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x271F:
-            dbgPrintf2("*** TEST 32 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x289F:
-            dbgPrintf2("*** TEST 33 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x2A43:
-            dbgPrintf2("*** TEST 34 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x2AED:
-            dbgPrintf2("*** TEST 35 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x2BA7:
-            dbgPrintf2("*** TEST 36 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x2C55:
-            dbgPrintf2("*** TEST 37 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x2D13:
-            dbgPrintf2("*** TEST 38 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x3103:
-            dbgPrintf2("*** TEST 40 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x32FC:
-            dbgPrintf2("*** TEST 41 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x3361:
-            dbgPrintf2("*** TEST 42 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x3405:
-            dbgPrintf2("*** TEST 43 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x345D:
-            dbgPrintf2("*** TEST 44 (%04X)\n", m6502.PC);
-            break;
-            
-        case 0x3469:
-            dbgPrintf2("*** TEST PASSED (%04X)\n", m6502.PC);
-            break;
-            
-        default:
-            break;
-    }
-#endif
-    
     disNewInstruction();
     
     switch ( fetch() ) {