diff --git a/tinygrad/codegen/__init__.py b/tinygrad/codegen/__init__.py
index 1e852231bc..2d690237b6 100644
--- a/tinygrad/codegen/__init__.py
+++ b/tinygrad/codegen/__init__.py
@@ -304,13 +304,13 @@ def full_rewrite_to_sink(ast:UOp, ren:Renderer, optimize:bool=True) -> UOp:
 
   # **** optimizations are done, now we lower to actual code ****
 
-  sink = graph_rewrite(sink, symbolic_simple+unbroadcast+pm_add_loads, name="*** unbroadcast / add loads")
+  sink = graph_rewrite(sink, mop_cleanup+symbolic_simple+unbroadcast, name="*** unbroadcast")
 
   # devectorize
   sink = graph_rewrite(sink, symbolic_simple+devectorizer2, ctx=ren, name="devectorize2")
 
   # simplify indexing
-  sink = graph_rewrite(sink, indexing_simplify, name="simplify load/store indexing")
+  sink = graph_rewrite(sink, pm_add_loads+indexing_simplify, name="simplify load/store indexing")
 
   # some coalesing misses without this
   sink = graph_rewrite(sink, sym, name="early symbolic")