diff --git a/src/compiler/Dataflow.h b/src/compiler/Dataflow.h
index a9917a3..2df9373 100644
--- a/src/compiler/Dataflow.h
+++ b/src/compiler/Dataflow.h
@@ -115,7 +115,7 @@
     ArenaBitVector* defV;
     ArenaBitVector* liveInV;
     ArenaBitVector* phiV;
-    int* dalvikToSSAMap;
+    int* vRegToSSAMap;
     ArenaBitVector* endingNullCheckV;
 };
 
@@ -147,13 +147,10 @@
     int minC;                   // For DIV - will affect lower bound checking
 };
 
-#define ENCODE_REG_SUB(r,s)             ((s<<16) | r)
-#define DECODE_REG(v)                   (v & 0xffff)
-#define DECODE_SUB(v)                   (((unsigned int) v) >> 16)
-
-
 void oatMethodNullCheckElimination(CompilationUnit*);
 
+void oatMethodBasicBlockOptimization(CompilationUnit*);
+
 }  // namespace art
 
 #endif  // ART_SRC_COMPILER_DATAFLOW_H_