diff --git a/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp
index 12ab1d6ca..58480e537 100644
--- a/primitives/primproc/batchprimitiveprocessor.cpp
+++ b/primitives/primproc/batchprimitiveprocessor.cpp
@@ -2287,34 +2287,29 @@ int BatchPrimitiveProcessor::operator()()
 
 void BatchPrimitiveProcessor::allocLargeBuffers()
 {
-  // auto allocator = exemgr::globServiceExeMgr->getRm().getAllocator<rowgroup::RGDataBufType>();
+  auto allocator = exemgr::globServiceExeMgr->getRm().getAllocator<rowgroup::RGDataBufType>();
 
   if (ot == ROW_GROUP && !outRowGroupData)
   {
-    // outputRG.setUseStringTable(true);
-    // outRowGroupData.reset(new RGData(outputRG, allocator));
-    outRowGroupData.reset(new RGData(outputRG));
+    outRowGroupData.reset(new RGData(outputRG, allocator));
     outputRG.setData(outRowGroupData.get());
   }
 
   if (fe1 && !fe1Data)
   {
-    // fe1Data.reset(new RGData(fe1Input, allocator));
-    fe1Data.reset(new RGData(fe1Input));
+    fe1Data.reset(new RGData(fe1Input, allocator));
     fe1Input.setData(fe1Data.get());
   }
 
   if (fe2 && !fe2Data)
   {
-    // fe2Data.reset(new RGData(fe2Output, allocator));
-    fe2Data.reset(new RGData(fe2Output));
+    fe2Data.reset(new RGData(fe2Output, allocator));
     fe2Output.setData(fe2Data.get());
   }
 
   if (getTupleJoinRowGroupData && !joinedRGMem)
   {
-    // joinedRGMem.reset(new RGData(joinedRG, allocator));
-    joinedRGMem.reset(new RGData(joinedRG));
+    joinedRGMem.reset(new RGData(joinedRG, allocator));
     joinedRG.setData(joinedRGMem.get());
   }
 }
diff --git a/utils/joiner/tuplejoiner.h b/utils/joiner/tuplejoiner.h
index 52d2a579f..fb64cde86 100644
--- a/utils/joiner/tuplejoiner.h
+++ b/utils/joiner/tuplejoiner.h
@@ -207,8 +207,6 @@ class TypelessDataStructure
 
 using RowPointersVec =
     std::vector<rowgroup::Row::Pointer, allocators::CountingAllocator<rowgroup::Row::Pointer>>;
-    // using RowPointersVec =
-    // std::vector<rowgroup::Row::Pointer>;
 using RowPointersVecUP = std::unique_ptr<RowPointersVec>;
 class TupleJoiner
 {
diff --git a/utils/windowfunction/idborderby.h b/utils/windowfunction/idborderby.h
index 3c0893d11..03b314289 100644
--- a/utils/windowfunction/idborderby.h
+++ b/utils/windowfunction/idborderby.h
@@ -81,31 +81,6 @@ class ReservablePQ : private std::priority_queue<_Tp, _Sequence, _Compare>
   using std::priority_queue<_Tp, _Sequence, _Compare>::empty;
 };
 
-// template <typename _Tp, typename _Sequence = std::vector<_Tp>,
-//           typename _Compare = std::less<typename _Sequence::value_type> >
-// class ReservablePQ : private std::priority_queue<_Tp, _Sequence, _Compare>
-// {
-//  public:
-//   typedef typename std::priority_queue<_Tp, _Sequence, _Compare>::size_type size_type;
-//   explicit ReservablePQ(size_type capacity = 0)
-//   {
-//     reserve(capacity);
-//   };
-//   void reserve(size_type capacity)
-//   {
-//     this->c.reserve(capacity);
-//   }
-//   size_type capacity() const
-//   {
-//     return this->c.capacity();
-//   }
-//   using std::priority_queue<_Tp, _Sequence, _Compare>::size;
-//   using std::priority_queue<_Tp, _Sequence, _Compare>::top;
-//   using std::priority_queue<_Tp, _Sequence, _Compare>::pop;
-//   using std::priority_queue<_Tp, _Sequence, _Compare>::push;
-//   using std::priority_queue<_Tp, _Sequence, _Compare>::empty;
-// };
-
 // forward reference
 class IdbCompare;
 class OrderByRow;