diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 1741871c..299f05c2 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -114,7 +114,7 @@ EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,sfxclineloc
 EXTSYM PLOTJmpa,PLOTJmpb,FxTable,FxTableb,FxTablec,FxTabled
 EXTSYM SfxPBR,SCBRrel,SfxSCBR,SfxCOLR,hdmaearlstart,SFXCounter
 EXTSYM fxbit01,fxbit01pcal,fxbit23,fxbit23pcal,fxbit45,fxbit45pcal,fxbit67,fxbit67pcal
-EXTSYM SfxSFR,nosprincr,hirqmode2
+EXTSYM SfxSFR,nosprincr
 EXTSYM cpucycle,debstop,switchtovirqdeb,debstop3,switchtonmideb
 EXTSYM ReadSPC7110log,WriteSPC7110log
 EXTSYM NetPlayNoMore
@@ -985,8 +985,6 @@ NetSaveState:
 %%nointrseta3
     cmp byte[intrset],1
     jne %%nointrseta2
-    cmp byte[hirqmode2],1
-    je %%hirqchange
     mov byte[intrset],8
     jmp %%noirq
 %%hirqchange
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index bb96e86c..7dfc41c6 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1391,7 +1391,6 @@ NEWSYM Offby1line,     db 0
 NEWSYM CacheCheckSkip,     db 0
 NEWSYM HIRQSkip,     db 0
 NEWSYM ClearScreenSkip, db 0
-NEWSYM hirqmode2, db 0
 NEWSYM ENVDisable, db 0
 SECTION .text
 
@@ -1483,7 +1482,6 @@ NEWSYM headerhack
     mov byte[hdmaearlstart],0
     mov dword[WindowDisables],0
     mov byte[ClearScreenSkip],0
-    mov byte[hirqmode2],0
     mov byte[ENVDisable],0
 
     mov esi,[romdata]
@@ -1729,13 +1727,6 @@ NEWSYM headerhack
 ;    mov byte[ENVDisable],1
 ;.notemeralddragon
 
-    mov esi,[romdata]
-    add esi,7FC0h
-    cmp dword[esi],'FF M'
-    jne .notffmq
-    mov byte[hirqmode2],1
-.notffmq
-
     mov esi,[romdata]
     add esi,07FC0h
     cmp dword[esi],'YOSH'