diff --git a/src/x49gpng/block-qcow.c b/src/x49gpng/block-qcow.c
index b90c6ee..9acaec8 100644
--- a/src/x49gpng/block-qcow.c
+++ b/src/x49gpng/block-qcow.c
@@ -27,9 +27,6 @@
 #include "block.h"
 #include "block_int.h"
 #include <zlib.h>
-#if 0
-#  include "aes.h"
-#endif
 
 /**************************************************************/
 /* QEMU COW block driver with compression and encryption support */
diff --git a/src/x49gpng/main.c b/src/x49gpng/main.c
index 29e10b0..c4c14f5 100644
--- a/src/x49gpng/main.c
+++ b/src/x49gpng/main.c
@@ -317,16 +317,5 @@ int main( int argc, char** argv )
     x49gp_modules_save( x49gp, opt.state_filename );
     x49gp_modules_exit( x49gp );
 
-#if false
-        printf("ClkTicks: %lu\n", ARMul_Time(x49gp->arm));
-        printf("D TLB: hit0 %lu, hit1 %lu, search %lu (%lu), walk %lu\n",
-                x49gp->mmu->dTLB.hit0, x49gp->mmu->dTLB.hit1,
-                x49gp->mmu->dTLB.search, x49gp->mmu->dTLB.nsearch,
-                x49gp->mmu->dTLB.walk);
-        printf("I TLB: hit0 %lu, hit1 %lu, search %lu (%lu), walk %lu\n",
-                x49gp->mmu->iTLB.hit0, x49gp->mmu->iTLB.hit1,
-                x49gp->mmu->iTLB.search, x49gp->mmu->iTLB.nsearch,
-                x49gp->mmu->iTLB.walk);
-#endif
     return 0;
 }
diff --git a/src/x49gpng/s3c2410_io_port.c b/src/x49gpng/s3c2410_io_port.c
index eb31482..dc24eba 100644
--- a/src/x49gpng/s3c2410_io_port.c
+++ b/src/x49gpng/s3c2410_io_port.c
@@ -212,11 +212,9 @@ static uint32_t s3c2410_io_port_read( void* opaque, target_phys_addr_t offset )
             break;
 
         case S3C2410_IO_PORT_GPFDAT:
-#if 1
             if ( 1 != ( ( io->gpfcon >> 6 ) & 3 ) ) {
                 *( reg->datap ) |= 0x0008;
             }
-#endif
             break;
 
         case S3C2410_IO_PORT_GPGDAT: