diff --git a/+af_tools/@Airfoil/Airfoil.m b/+af_tools/@Airfoil/Airfoil.m
index 33cc5dc6b769c27b64145f503689d240518057e1..b3255aa0fbe729b19c346d0e80306116ae3d1c6e 100644
--- a/+af_tools/@Airfoil/Airfoil.m
+++ b/+af_tools/@Airfoil/Airfoil.m
@@ -70,8 +70,6 @@ classdef Airfoil < handle
             %   If no name is given, it will be retreived from the coordFile. See main class help
             %   for details.
 
-            self.Polar = af_tools.Polar;
-
             if nargin > 0 && ~isempty(coordFile)
                 import af_tools.*
 
@@ -88,27 +86,21 @@ classdef Airfoil < handle
                     self.name = Dat.airfoil;
                 end
             end
+
+            self.Polar = af_tools.Polar;
+
         end
 
-        % ---------------------------------------
+        % ---------------------------------------------
         % Other methods
+
         function self = loadpolar(self, polarFile)
-            self.Polar = self.Polar.loadpolar(polarFile);
+            self.Polar = af_tools.Polar.loadpolar(polarFile);
         end
 
         function self = polypolar(self, clPoly, cdPoly)
-            self.Polar = self.Polar.polypolar(clPoly, cdPoly);
+            self.Polar = af_tools.Polar.polypolar(clPoly, cdPoly);
         end
 
-        function self = extendpolar(self)
-            self.Polar = self.Polar.extendpolar();
-        end
-
-        function self = analyze(self)
-            self.Polar = self.Polar.analyze();
-        end
-
-        self = addextremereynolds(self)
-
     end
 end
diff --git a/+af_tools/@Airfoil/addextremereynolds.m b/+af_tools/@Airfoil/addextremereynolds.m
deleted file mode 100644
index 5fc877ebb1e3f76dc260bb7f7e1832dd19f412c4..0000000000000000000000000000000000000000
--- a/+af_tools/@Airfoil/addextremereynolds.m
+++ /dev/null
@@ -1,45 +0,0 @@
-function obj = addextremereynolds(obj)
-    % ADDEXTREMEREYNOLDS  Adds dupplicate polars for extreme Reynolds number.
-    %   In order to make a proper interpolation later on, this method duplicates the polars for the
-    %   lowest and highest Reynolds and assign these respectively to Re = 1 and Re = 1e15.
-    %   This will allow extrapolation outside of the original Range by symply considering the Polars
-    %   to be Reynolds-independant if the Reynolds is very low or very high.
-    %
-    % Note:
-    %   If we have only one polar (i.e. one Reynolds), then this method does not do anything.
-    % -----
-    % <a href="https://gitlab.uliege.be/am-dept/matlab_airfoil_toolbox">Documentation (online)</a>
-
-    % -------------------------------------------
-    % (c) Copyright 2022 University of Liege
-    % Author: Thomas Lambert <t.lambert@uliege.be>
-    % ULiege - Aeroelasticity and Experimental Aerodynamics
-    % MIT License
-    % Repo: https://gitlab.uliege.be/am-dept/matlab_airfoil_toolbox
-    % Issues: https://gitlab.uliege.be/am-dept/matlab_airfoil_toolbox/-/issues
-    % ----------------------------------------------------------------------------------------------
-
-    % Defaults extreme Reynolds
-    DEF.LOW_REYNOLDS = 1;
-    DEF.HIGH_REYNOLDS = 1e15;
-
-    % Add duplicate polars for extreme Reynolds
-    if ~isempty(obj.Polar)
-
-        if length(obj.Polar.reynolds) > 1
-            obj.Polar.reynolds = [DEF.LOW_REYNOLDS, obj.Polar.reynolds, DEF.HIGH_REYNOLDS];
-            obj.Polar.aoa = duplicateextremes(obj.Polar.aoa);
-            obj.Polar.cl = duplicateextremes(obj.Polar.cl);
-            obj.Polar.cd = duplicateextremes(obj.Polar.cd);
-            obj.Polar.cm = duplicateextremes(obj.Polar.cm);
-        end
-
-    end
-
-end
-
-function array = duplicateextremes(array)
-    % DUPLICATEEXTREMES  Duplicates the first and last columns of an array
-    array = [array(:, 1), array, array(:, end)];
-
-end
diff --git a/+af_tools/@Polar/Polar.m b/+af_tools/@Polar/Polar.m
index 3925cf9648850a4cd921d67b1e5eaa740f5555de..8d1e0c7276ee8cb09eb8d793d08262ce48ead31f 100644
--- a/+af_tools/@Polar/Polar.m
+++ b/+af_tools/@Polar/Polar.m
@@ -176,12 +176,9 @@ classdef Polar < handle
     % ----------------------------------------------------------------------------------------------
 
     methods (Static)
-        self = loadpolar(polarFile) % Load polar from file
-    end
-
-    % ----------------------------------------------------------------------------------------------
-
-    methods (Static)
+        self = loadpolar(self, polarFile) % Load polar from file
         self = polypolar(polyCl, polyCd) % Create polar using polynomial coefficients
+
     end
+
 end