diff --git a/juno_samples/rodinia/bfs/src/cpu.sch b/juno_samples/rodinia/bfs/src/cpu.sch
index 34b735066dcfd7fac275a42bee301063dc0f4494..339782d6a84b6a43f31d81f5c9b23240dd10a292 100644
--- a/juno_samples/rodinia/bfs/src/cpu.sch
+++ b/juno_samples/rodinia/bfs/src/cpu.sch
@@ -46,8 +46,6 @@ let traverse_body = outline(inner);
 let (outer, inner) = fork-reshape[[1], [0]](collect);
 let collect_body = outline(inner);
 
-let init_body = init;
-// Following code seems to generate breaking RT code
 fork-tile[32, 0, false, true](init);
 let (outer, inner) = fork-reshape[[1], [0]](init);
 let init_body = outline(inner);
diff --git a/juno_samples/rodinia/bfs/src/gpu.sch b/juno_samples/rodinia/bfs/src/gpu.sch
index 3e2c133e1d0d0f04005c8269d8150c5fb316acf9..0253a0210f6cc2451d38399601ad39ff3ab9465a 100644
--- a/juno_samples/rodinia/bfs/src/gpu.sch
+++ b/juno_samples/rodinia/bfs/src/gpu.sch
@@ -38,11 +38,9 @@ fixpoint {
 }
 simpl!(collect);
 
-fork-tile[32, 0, false, true](traverse, collect);
-let (outer, inner) = fork-reshape[[1], [0]](traverse);
-let traverse_body = outline(inner);
-let (outer, inner) = fork-reshape[[1], [0]](collect);
-let collect_body = outline(inner);
+fork-tile[32, 0, false, true](init);
+let (outer, inner) = fork-reshape[[1], [0]](init);
+let init_body = outline(inner);
 
 fork-tile[1024, 0, false, true](traverse, collect);
 fork-split(traverse, collect);