diff --git a/src/eval/eval_interpret.c b/src/eval/eval_interpret.c
index 12ce59a3..a31993c1 100644
--- a/src/eval/eval_interpret.c
+++ b/src/eval/eval_interpret.c
@@ -125,7 +125,7 @@ e_interpret(String8 bytecode)
     }
     else switch(op)
     {
-      case E_IRExtKind_SetSpace:     {ctrlbits = RDI_EVAL_CTRLBITS(32, 0, 0);}break;
+      case E_IRExtKind_SetSpace:{ctrlbits = RDI_EVAL_CTRLBITS(32, 0, 0);}break;
       default:
       {
         result.code = E_InterpretationCode_BadOp;
@@ -210,10 +210,6 @@ e_interpret(String8 bytecode)
           result.code = E_InterpretationCode_BadMemRead;
           goto done;
         }
-        if(e_space_match(selected_space, e_interpret_ctx->reg_space))
-        {
-          selected_space = e_interpret_ctx->primary_space;
-        }
       }break;
       
       case RDI_EvalOp_RegRead:
diff --git a/src/eval/eval_ir.c b/src/eval/eval_ir.c
index 2187a178..01a93360 100644
--- a/src/eval/eval_ir.c
+++ b/src/eval/eval_ir.c
@@ -2178,7 +2178,6 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I
                 {
                   string_mapped = 1;
                   RDI_LocationReg loc = *(RDI_LocationReg *)(all_location_data + block->location_data_off);
-                  
                   REGS_RegCode regs_reg_code = regs_reg_code_from_arch_rdi_code(arch, loc.reg_code);
                   REGS_Rng reg_rng = regs_reg_code_rng_table_from_arch(arch)[regs_reg_code];
                   E_OpList oplist = {0};