diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
index 30c37ec9e27..890b8fad86d 100644
--- a/SU2_CFD/include/drivers/CDriver.hpp
+++ b/SU2_CFD/include/drivers/CDriver.hpp
@@ -745,7 +745,7 @@ class CFluidDriver : public CDriver {
 protected:
    unsigned long Max_Iter;
 
-public:
+protected:
 
   /*!
    * \brief Constructor of the class.
@@ -758,6 +758,7 @@ class CFluidDriver : public CDriver {
                unsigned short val_nZone,
                SU2_Comm MPICommunicator);
 
+public:
   /*!
    * \brief Destructor of the class.
    */
diff --git a/SU2_CFD/include/solvers/CSolver.hpp b/SU2_CFD/include/solvers/CSolver.hpp
index 48e929d665c..aa3c12f5c92 100644
--- a/SU2_CFD/include/solvers/CSolver.hpp
+++ b/SU2_CFD/include/solvers/CSolver.hpp
@@ -781,22 +781,6 @@ class CSolver {
                                       CConfig *config,
                                       unsigned short iMesh) { }
 
-  /*!
-   * \brief A virtual member.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] iMesh - Index of the mesh in multigrid computations.
-   * \param[in] iRKStep - Current step of the Runge-Kutta iteration.
-   */
-  inline virtual void Convective_Residual(CGeometry *geometry,
-                                          CSolver **solver_container,
-                                          CNumerics *numerics,
-                                          CConfig *config,
-                                          unsigned short iMesh,
-                                          unsigned short iRKStep) { }
-
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
index 35d49885482..92d2d527238 100644
--- a/SU2_CFD/src/SU2_CFD.cpp
+++ b/SU2_CFD/src/SU2_CFD.cpp
@@ -143,13 +143,7 @@ int main(int argc, char *argv[]) {
     /*--- Turbomachinery problem. ---*/
     driver = new CTurbomachineryDriver(config_file_name, nZone, MPICommunicator);
 
-  }
-  else {
-
-    /*--- Instantiate the class for external aerodynamics by default. ---*/
-    driver = new CFluidDriver(config_file_name, nZone, MPICommunicator);
-
-  }
+  } /*--- These are all the possible cases ---*/
 
   delete config;
   config = nullptr;
diff --git a/SU2_CFD/src/integration/CIntegration.cpp b/SU2_CFD/src/integration/CIntegration.cpp
index 729eb41958b..b75163c1af1 100644
--- a/SU2_CFD/src/integration/CIntegration.cpp
+++ b/SU2_CFD/src/integration/CIntegration.cpp
@@ -58,9 +58,6 @@ void CIntegration::Space_Integration(CGeometry *geometry,
     case SPACE_UPWIND:
       solver_container[MainSolver]->Upwind_Residual(geometry, solver_container, numerics, config, iMesh);
       break;
-    case FINITE_ELEMENT:
-      solver_container[MainSolver]->Convective_Residual(geometry, solver_container, numerics[CONV_TERM], config, iMesh, iRKStep);
-      break;
   }
 
   /*--- Compute viscous residuals ---*/