diff --git a/arch/Mips/MipsDisassembler.c b/arch/Mips/MipsDisassembler.c
index 5d443131..3b565d2b 100644
--- a/arch/Mips/MipsDisassembler.c
+++ b/arch/Mips/MipsDisassembler.c
@@ -288,7 +288,7 @@ bool Mips_getInstruction(csh ud, unsigned char *code, size_t code_len, MCInst *i
 			code, code_len,
 			size,
 			address, handle->big_endian, (MCRegisterInfo *)info,
-			handle->micro_mips);
+			handle->mode & CS_MODE_MICRO);
 
 	return status == MCDisassembler_Success;
 }
@@ -371,11 +371,6 @@ static DecodeStatus DecodeGPR32RegisterClass(MCInst *Inst,
 static DecodeStatus DecodePtrRegisterClass(MCInst *Inst,
 		unsigned RegNo, uint64_t Address, MCRegisterInfo *Decoder)
 {
-	/* TODO: N64 support
-	if (static_cast<const MipsDisassembler *>(Decoder)->isN64())
-		return DecodeGPR64RegisterClass(Inst, RegNo, Address, Decoder);
-	 */
-
 	return DecodeGPR32RegisterClass(Inst, RegNo, Address, Decoder);
 }
 
diff --git a/cs.c b/cs.c
index b517f4e8..4504bf27 100644
--- a/cs.c
+++ b/cs.c
@@ -109,9 +109,6 @@ cs_err cs_open(cs_arch arch, cs_mode mode, csh *handle)
 				   else
 					   ud->disasm = Mips64_getInstruction;
 
-				   if (ud->mode & CS_MODE_MICRO)
-					   ud->micro_mips = true;
-
 				   break;
 			}
 		case CS_ARCH_ARM64: {
diff --git a/cs_priv.h b/cs_priv.h
index 7b72dd5d..b59b734d 100644
--- a/cs_priv.h
+++ b/cs_priv.h
@@ -39,7 +39,6 @@ typedef struct cs_struct {
 	GetName_t insn_name;
 	GetID_t insn_id;
 	PostPrinter_t post_printer;
-	bool micro_mips;	// for Mips only
 	cs_err errnum;
 	ARM_ITStatus ITBlock;	// for Arm only
 } cs_struct;