diff --git a/dbcon/joblist/tuplehashjoin.cpp b/dbcon/joblist/tuplehashjoin.cpp
index b0228711a..cefddc8c7 100644
--- a/dbcon/joblist/tuplehashjoin.cpp
+++ b/dbcon/joblist/tuplehashjoin.cpp
@@ -365,30 +365,6 @@ void TupleHashJoinStep::outOfMemoryHandler(std::shared_ptr<joiner::TupleJoiner>
   }
 }
 
-void TupleHashJoinStep::outOfMemoryHandler(std::shared_ptr<joiner::TupleJoiner> joiner)
-{
-  boost::unique_lock<boost::mutex> sl(saneErrMsg);
-
-  if (cancelled())
-    return;
-  if (!allowDJS || isDML || (fSessionId & 0x80000000) || (tableOid() < 3000 && tableOid() >= 1000))
-  {
-    joinIsTooBig = true;
-    ostringstream oss;
-    oss << "(" << __LINE__ << ") " << logging::IDBErrorInfo::instance()->errorMsg(logging::ERR_JOIN_TOO_BIG);
-    fLogger->logMessage(logging::LOG_TYPE_INFO, oss.str());
-    errorMessage(oss.str());
-    status(logging::ERR_JOIN_TOO_BIG);
-    cout << "Join is too big, raise the UM join limit for now (small runner)" << endl;
-    abort();
-  }
-  else if (allowDJS)
-  {
-    joiner->setConvertToDiskJoin();
-    // TODO RGData that triggers this path is lost. Need to store it to pass it future.
-  }
-}
-
 /* Index is which small input to read. */
 void TupleHashJoinStep::smallRunnerFcn(uint32_t index, uint threadID, uint64_t* jobs)
 {
diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h
index a9face207..619c85f03 100644
--- a/utils/rowgroup/rowgroup.h
+++ b/utils/rowgroup/rowgroup.h
@@ -609,7 +609,6 @@ class Row
   }
 
   const CHARSET_INFO* getCharset(uint32_t col) const;
- inline bool inStringTable(uint32_t col) const;
 
  private:
   inline bool inStringTable(uint32_t col) const;
diff --git a/utils/windowfunction/idborderby.h b/utils/windowfunction/idborderby.h
index fee09cf87..6616c3aaf 100644
--- a/utils/windowfunction/idborderby.h
+++ b/utils/windowfunction/idborderby.h
@@ -52,7 +52,7 @@ class ReservablePQ : private std::priority_queue<_Tp, _Sequence, _Compare>
 {
  public:
   typedef typename std::priority_queue<_Tp, _Sequence, _Compare>::size_type size_type;
-  explicit explicit ReservablePQ(size_type capacity, std::atomic<int64_t>* memoryLimit,
+  explicit ReservablePQ(size_type capacity, std::atomic<int64_t>* memoryLimit,
                     const int64_t checkPointStepSize = allocators::CheckPointStepSize,
                     const int64_t lowerBound = allocators::MemoryLimitLowerBound)
     : std::priority_queue<_Tp, _Sequence, _Compare>(_Compare(),