diff --git a/src/guided_dc.cc b/src/guided_dc.cc
index e3d62346685841697840c01e7908cc121dfa2b9f..8e3b37bc109735e12de0af52976c7f2a530293bd 100644
--- a/src/guided_dc.cc
+++ b/src/guided_dc.cc
@@ -71,7 +71,6 @@ void stencil(HpvmBufHeader<LNode>* buf_header, size_t header_size) {
   root->next->val = 100;
   while (root) {
     root->delta(1);
-    // root->val = (size_t)root->next;
     root = root->next;
   }
 
@@ -94,21 +93,6 @@ int main(int argc, char* argv[]) {
                               host_buf.buf->total_size(), 1, host_buf.buf,
                               host_buf.buf->total_size());
   __hetero_wait(DFG);
-#else
-/*
-  auto* buf_header = host_buf.buf;
-
-  buf_header->to_absolute_pointer(buf_header->get_obj_start());
-  LNode* root = (LNode*)buf_header->get_obj_start();
-
-  while (root) {
-    root->delta(1);
-    // root->val = (size_t)root->next;
-    root = root->next;
-  }
-
-  buf_header->to_relative_pointer(buf_header->get_obj_start());
-        */
 #endif
 
   std::cout << "After kernel in buffer:\n";
diff --git a/src/hpvm_dclib.hpp b/src/hpvm_dclib.hpp
index 07d4512f4b733688182d6632e735c518dbe08bee..135f71d2a91e53cbd6a9025158c3db1fe4194e4c 100644
--- a/src/hpvm_dclib.hpp
+++ b/src/hpvm_dclib.hpp
@@ -25,6 +25,7 @@
 using byte = char;
 
 // In a separate file ----------------------
+// TODO: move to separate file to make this global
 static std::unordered_map<void*, std::pair<const std::type_info*, size_t>>
     hpvm_allocation_record;