diff --git a/dbcon/execplan/aggregatecolumn.cpp b/dbcon/execplan/aggregatecolumn.cpp
index fa3428b25..3494723f4 100644
--- a/dbcon/execplan/aggregatecolumn.cpp
+++ b/dbcon/execplan/aggregatecolumn.cpp
@@ -138,39 +138,26 @@ AggregateColumn::AggregateColumn(const AggregateColumn& rhs, const uint32_t sess
  * Methods
  */
 
-void AggregateColumn::setSimpleColumnList()
-{
-  fSimpleColumnList.clear();
-  return setSimpleColumnList_(false);
-}
-
 void AggregateColumn::setSimpleColumnListExtended()
 {
   fSimpleColumnListExtended.clear();
-  return setSimpleColumnList_(true);
+  return setSimpleColumnListExtended_();
 }
 
-void AggregateColumn::setSimpleColumnList_(const bool extractSCsfromAggCol)
+void AggregateColumn::setSimpleColumnListExtended_()
 {
   for (const auto& parm : aggParms())
   {
     if (!parm)
       continue;
 
-    auto aggParmsAsSCVec = (extractSCsfromAggCol) ? getSCsFromRCForExtended(parm) : getSCsFromRC(parm);
+    auto aggParmsAsSCVec = getSCsFromRCForExtended(parm);
 
     for (auto* sc : aggParmsAsSCVec)
     {
       if (sc)
       {
-        if (extractSCsfromAggCol)
-        {
-          fSimpleColumnListExtended.push_back(sc);
-        }
-        else
-        {
-          fSimpleColumnList.push_back(sc);
-        }
+        fSimpleColumnListExtended.push_back(sc);
       }
     }
   }
diff --git a/dbcon/execplan/aggregatecolumn.h b/dbcon/execplan/aggregatecolumn.h
index d24e75119..b38ef0c4d 100644
--- a/dbcon/execplan/aggregatecolumn.h
+++ b/dbcon/execplan/aggregatecolumn.h
@@ -161,9 +161,8 @@ class AggregateColumn : public ReturnedColumn
     fAggParms = parms;
   }
 
-  void setSimpleColumnList_(const bool extractSCsfromAggCol);
-  void setSimpleColumnList() override;
   void setSimpleColumnListExtended() override;
+  void setSimpleColumnListExtended_();
 
   /** return a copy of this pointer
    *
diff --git a/dbcon/execplan/simplefilter.cpp b/dbcon/execplan/simplefilter.cpp
index 8ac61522d..00b5b6904 100644
--- a/dbcon/execplan/simplefilter.cpp
+++ b/dbcon/execplan/simplefilter.cpp
@@ -857,19 +857,21 @@ void SimpleFilter::setSimpleColumnListExtended()
   else if (fLhs)
   {
     fLhs->setSimpleColumnListExtended();
-    fSimpleColumnList.insert(fSimpleColumnList.end(), fLhs->simpleColumnListExtended().begin(),
-                             fLhs->simpleColumnListExtended().end());
+    fSimpleColumnListExtended.insert(fSimpleColumnListExtended.end(),
+                                     fLhs->simpleColumnListExtended().begin(),
+                                     fLhs->simpleColumnListExtended().end());
   }
 
   if (rsc)
   {
-    fSimpleColumnList.push_back(rsc);
+    fSimpleColumnListExtended.push_back(rsc);
   }
   else if (fRhs)
   {
     fRhs->setSimpleColumnListExtended();
-    fSimpleColumnList.insert(fSimpleColumnList.end(), fRhs->simpleColumnListExtended().begin(),
-                             fRhs->simpleColumnListExtended().end());
+    fSimpleColumnListExtended.insert(fSimpleColumnListExtended.end(),
+                                     fRhs->simpleColumnListExtended().begin(),
+                                     fRhs->simpleColumnListExtended().end());
   }
 }
 
diff --git a/dbcon/rbo/rbo_apply_parallel_ces.cpp b/dbcon/rbo/rbo_apply_parallel_ces.cpp
index 4c65d6bb8..a5b65e08e 100644
--- a/dbcon/rbo/rbo_apply_parallel_ces.cpp
+++ b/dbcon/rbo/rbo_apply_parallel_ces.cpp
@@ -544,13 +544,6 @@ void updateSCsUsingWalkers(optimizer::TableAliasToNewAliasAndSCPositionsMap& tab
   {
     tryToUpdateScToUseRewrittenDerived(sc, tableAliasToSCPositionsMap);
   }
-
-  std::vector<execplan::SimpleColumn*> simpleColumnsFromAgg;
-  pt->walk(execplan::getAggCols, &simpleColumnsFromAgg);
-  for (auto* sc : simpleColumnsFromAgg)
-  {
-    tryToUpdateScToUseRewrittenDerived(sc, tableAliasToSCPositionsMap);
-  }
 }
 
 // This routine takes tableAliasToSCPositionsMap and extraSCs and correlate extraSCs with positions.