diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index 148a9ccba..5c12480a1 100644
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -6316,7 +6316,7 @@ void extractColumnStatistics(Item_field* ifp, gp_walk_info& gwi)
   }
 }
 #else
-void extractColumnStatistics(Item_field* ifp, gp_walk_info& gwi)
+void extractColumnStatistics(Item_field* /*ifp*/, gp_walk_info& /*gwi*/)
 {
 }
 #endif
diff --git a/dbcon/mysql/ha_mcs_impl_if.h b/dbcon/mysql/ha_mcs_impl_if.h
index acb0b042e..7bf0581ef 100644
--- a/dbcon/mysql/ha_mcs_impl_if.h
+++ b/dbcon/mysql/ha_mcs_impl_if.h
@@ -28,7 +28,6 @@
 #include <vector>
 #include "basic/string_utils.h"
 #include "idb_mysql.h"
-#include "sql_statistics.h"
 #include "ha_mcs_sysvars.h"
 
 #include "dmlpkg.h"
diff --git a/dbcon/mysql/ha_select_sub.cpp b/dbcon/mysql/ha_select_sub.cpp
index caddce6af..8f29b2e22 100644
--- a/dbcon/mysql/ha_select_sub.cpp
+++ b/dbcon/mysql/ha_select_sub.cpp
@@ -98,8 +98,6 @@ SCSEP SelectSubQuery::transform()
 
   // Insert column statistics
   fGwip.mergeTableStatistics(gwi.tableStatisticsMap);
-  // std::cout << "fGwip.columnStatisticsMap 2 size " << fGwip.columnStatisticsMap.size() << std::endl;
-  // std::cout << "gwi.columnStatisticsMap 2 size " << gwi.columnStatisticsMap.size() << std::endl;
 
   // Insert subselect CSEP
   fGwip.subselectList.push_back(csep);
diff --git a/dbcon/mysql/idb_mysql.h b/dbcon/mysql/idb_mysql.h
index efc4260e3..d18e2bcf3 100644
--- a/dbcon/mysql/idb_mysql.h
+++ b/dbcon/mysql/idb_mysql.h
@@ -87,7 +87,7 @@ struct Histogram_bucket
   longlong ndv;
 };
 
-class Histogram_json_hb final : public Histogram_base
+class Histogram_json_hb
 {
   std::vector<Histogram_bucket> buckets;
 
diff --git a/dbcon/mysql/rbo_apply_parallel_ces.cpp b/dbcon/mysql/rbo_apply_parallel_ces.cpp
index 05e1d879b..1d710126f 100644
--- a/dbcon/mysql/rbo_apply_parallel_ces.cpp
+++ b/dbcon/mysql/rbo_apply_parallel_ces.cpp
@@ -58,7 +58,7 @@ bool matchParallelCES(execplan::CalpontSelectExecutionPlan& csep)
 {
   auto tables = csep.tableList();
   // This is leaf and there are no other tables at this level in neither UNION, nor derived table.
-  // WIP filter out CSEPs with orderBy, groupBy, having
+  // TODO filter out CSEPs with orderBy, groupBy, having
   // Filter out tables that were re-written.
   return tables.size() == 1 && !tables[0].isColumnstore() && !tableIsInUnion(tables[0], csep);
 }
@@ -76,13 +76,12 @@ execplan::ParseTree* filtersWithNewRangeAddedIfNeeded(execplan::SCSEP& csep, exe
   auto* filterColLeftOp = new execplan::ConstantColumnUInt(bound.second, 0, 0);
   // set TZ
   // There is a question with ownership of the const column
-  // WIP here we lost upper bound value if predicate is not changed to weak lt
+  // TODO here we lost upper bound value if predicate is not changed to weak lt
   execplan::SOP ltOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator("<"));
   ltOp->setOpType(filterColLeftOp->resultType(), tableKeyColumnLeftOp->resultType());
   ltOp->resultType(ltOp->operationType());
 
   auto* sfr = new execplan::SimpleFilter(ltOp, tableKeyColumnLeftOp, filterColLeftOp);
-  // auto tableKeyColumn = derivedSCEP->returnedCols().front();
   auto tableKeyColumnRightOp = new execplan::SimpleColumn(column);
   tableKeyColumnRightOp->resultType(column.resultType());
   // TODO hardcoded column type and value