diff --git a/source/arm11/hardware/gfx.c b/source/arm11/hardware/gfx.c
index 7f540d0..1105633 100644
--- a/source/arm11/hardware/gfx.c
+++ b/source/arm11/hardware/gfx.c
@@ -207,16 +207,13 @@
 
 void* GFX_getFramebuffer(u8 screen)
 {
-	if(!activeFb)
+	static void *const framebufTable[2][2] =
 	{
-		if(screen) return (void*)FRAMEBUF_TOP_A_2;
-		else       return (void*)FRAMEBUF_SUB_A_2;
-	}
-	else
-	{
-		if(screen) return (void*)FRAMEBUF_TOP_A_1;
-		else       return (void*)FRAMEBUF_SUB_A_1;
-	}
+		{(void*)FRAMEBUF_SUB_A_2, (void*)FRAMEBUF_SUB_A_1},
+		{(void*)FRAMEBUF_TOP_A_2, (void*)FRAMEBUF_TOP_A_1}
+	};
+
+	return framebufTable[screen][activeFb];
 }
 
 void GFX_swapFramebufs(void)
diff --git a/source/arm9/hardware/crypto.c b/source/arm9/hardware/crypto.c
index 9e7af96..89a4f22 100644
--- a/source/arm9/hardware/crypto.c
+++ b/source/arm9/hardware/crypto.c
@@ -61,15 +61,6 @@
 #define REG_AESKEYYFIFO       ((vu32*)(AES_REGS_BASE + 0x108))
 
 
-/*static void deriveKey(u32 pad[4], u32 boot9Off)
-{
-	const u32 *pad2 = (u32*)(BOOT9_BASE + boot9Off);
-
-	pad[0] ^= pad2[0];
-	pad[1] ^= pad2[1];
-	pad[2] ^= pad2[2];
-	pad[3] ^= pad2[3];
-}*/
 
 static void setupKeys(void)
 {