diff --git a/classes/Bay.m b/classes/Bay.m
index f31df1023aff9286dbe100ac15ddbab986a011c9..d051373340d27bb26cd40496b53e1e422021437d 100644
--- a/classes/Bay.m
+++ b/classes/Bay.m
@@ -5,7 +5,6 @@ classdef Bay < Component & matlab.mixin.Heterogeneous
     properties(Abstract)
         position    % [m]       OVERRIDE Position, relative to previous component - 
         length      % [m]       Total bay length
-        diameter    % [m]       Diameter of the bay
         mass        % [kg]      Total bay mass
         inertia     % [kg*m^2]  Total bay inertia (Body reference)
         xCg         % [m]       Cg relative to bay upper side
diff --git a/classes/Rocket.m b/classes/Rocket.m
index 9fdd40a638bbe559ea14ae3549c8b22786b32015..2a2a90189dfd81729421552458e8d177252bc381 100644
--- a/classes/Rocket.m
+++ b/classes/Rocket.m
@@ -69,14 +69,6 @@ classdef Rocket < Component
             obj.length = (obj.absolutePositions(end) + obj.bays(end).length) - obj.absolutePositions(1);
         end
 
-        function updateDiameter(obj)
-            if ~isempty(obj.diameter)
-                return;
-            end
-            % Take payload diameter as reference
-            obj.diameter = obj.payload.diameter;
-        end
-
         function updateMassNoMotor(obj)
             if ~isempty(obj.massNoMotor)
                 return;
@@ -140,7 +132,6 @@ classdef Rocket < Component
             % Note: properties without motor must be updated first
             obj.updateAbsolutePositions;
             obj.updateLength;
-            obj.updateDiameter;
             obj.updateMassNoMotor;
             obj.updateMass;
             obj.updateXCgNoMotor;
diff --git a/classes/bays/Airbrakes.m b/classes/bays/Airbrakes.m
index 34a5405e7276dcfb13021215c93fd1dab8c6347f..72f0eabe7316ade615d2ccba998a5dca90ee8e73 100644
--- a/classes/bays/Airbrakes.m
+++ b/classes/bays/Airbrakes.m
@@ -24,7 +24,6 @@ classdef Airbrakes < Bay
         height          double          % [m] Block airbrakes opening coordinate ( First entry must be 0! )
         position                        % [m] Offset with respect to other bays (negative -> shift forward)
         length                          % [m] Total bay length
-        diameter                        % [m] Diameter of the bay
         mass                            % [kg] Total bay mass
         inertia                         % [kg*m^2] Total bay inertia (Body reference)
         xCg                             % [m] Cg relative to bay upper side
diff --git a/classes/bays/Electronics.m b/classes/bays/Electronics.m
index c7b419e29cb564fb49e7229cd8e1af6ea6d60c23..a9448aa834efea6ca915ddce4ebf3b4b97b7e4aa 100644
--- a/classes/bays/Electronics.m
+++ b/classes/bays/Electronics.m
@@ -13,7 +13,6 @@ classdef Electronics < Bay
         offset = 0
         position    % [m] Absolute position, relative to nose base
         length      % [m] Total bay length
-        diameter    % [m] Diameter of the bay
         mass        % [kg] Total bay mass
         inertia     % [kg*m^2] Total bay inertia (Body reference)
         xCg         % [m] Cg relative to bay upper side
diff --git a/classes/bays/Motor.m b/classes/bays/Motor.m
index 39bb44213e7fb2651718a0563ba3e90b65d56673..41229b1f4329ab808b2798b8109cccb24be91a96 100644
--- a/classes/bays/Motor.m
+++ b/classes/bays/Motor.m
@@ -13,7 +13,6 @@ classdef Motor < Bay
         name                {mustBeTextScalar} = '' % [-]  Motor name
         position                                    % [m] Absolute position, relative to nose base
         length                                      % [m]  Total length (motor + tank)
-        diameter                                    % [m]  Diameter of the Motor 
         inertia                                     % [kg*m^2] Total Motor inertia (Body reference)
         cutoffTime          double                  % [s]  Shutdown time
         tankLength          double                  % [m]  Tank length
@@ -78,7 +77,6 @@ classdef Motor < Bay
                 error(strcat('Unable to find engine: ', obj.name));
             end
             
-            obj.diameter       = chosenMotor.D;
             obj.length         = chosenMotor.L;    
             obj.tankLength     = chosenMotor.Ltank;
             obj.time           = chosenMotor.t;    
diff --git a/classes/bays/Payload.m b/classes/bays/Payload.m
index f7f3d4d1a7ac3013309774f99b5a2f7ad6b131cf..929e3718786860472e9428cd5ba843d8ef4486b5 100644
--- a/classes/bays/Payload.m
+++ b/classes/bays/Payload.m
@@ -22,7 +22,6 @@ classdef Payload < Bay
 
         position                                                 % [m] Absolute position, relative to nose base
         length                                                   % [m] Total bay length
-        diameter                                                 % [m] Diameter of the bay
         mass                                                     % [kg] Total bay mass
         inertia                                                  % [kg*m^2] Total bay inertia (Body reference)
         xCg                                                      % [m] Cg relative to bay upper side
diff --git a/classes/bays/Rear.m b/classes/bays/Rear.m
index 06cf64a8fb0f7d11c51310b31102335bc6ca468e..65d561d73eb9973703fe104184df2805f0981cd7 100644
--- a/classes/bays/Rear.m
+++ b/classes/bays/Rear.m
@@ -13,7 +13,6 @@ classdef Rear < Bay
     properties
         position                                                            % [m] Absolute position, relative to nose base
         length                                                              % [m] Total bay length
-        diameter                                                            % [m] Final diameter of the bay
         mass                                                                % [kg] Total bay mass
         inertia                                                             % [kg*m^2] Total bay inertia (Body reference)
         xCg                                                                 % [m] Cg relative to bay upper side
diff --git a/classes/bays/Recovery.m b/classes/bays/Recovery.m
index 1947b29244b270e1dc496960b9239c064d961e73..b5d10de236fb9b2668a0c71493442c1cf19b903b 100644
--- a/classes/bays/Recovery.m
+++ b/classes/bays/Recovery.m
@@ -13,7 +13,6 @@ classdef Recovery < Bay
     properties
         position    % [m] Absolute position, relative to nose base
         length      % [m] Total bay length
-        diameter    % [m] Diameter of the bay
         mass        % [kg] Total bay mass
         inertia     % [kg*m^2] Total bay inertia (Body reference)
         xCg         % [m] Cg relative to bay upper side
diff --git a/missions/2024_Lyra_Roccaraso_September/config/rocketConfig.m b/missions/2024_Lyra_Roccaraso_September/config/rocketConfig.m
index fc4a91ed95119e965002c7313c3d21759cf79b1a..5494f4dcc3553e22cb72b12acd2e84ed8fd7f47d 100644
--- a/missions/2024_Lyra_Roccaraso_September/config/rocketConfig.m
+++ b/missions/2024_Lyra_Roccaraso_September/config/rocketConfig.m
@@ -4,7 +4,7 @@
 rocket = Rocket();
 
 rocket.length = [];                                        % [m]  OVERRIDE total length
-rocket.diameter = [];                                      % [m]  OVERRIDE diameter
+rocket.diameter = 0.15;                                    % [m]  OVERRIDE diameter
 rocket.mass = [];                                          % [kg] OVERRIDE total mass
 rocket.massNoMotor = [];                                   % [kg] OVERRIDE mass without motor
 rocket.inertia = [];                                       % [kg*m^2] OVERRIDE total inertia - Axibody reference
@@ -16,7 +16,6 @@ rocket.xCgNoMotor = [];                                    % [m]   OVERRIDE xCg
 payload = Payload();
 
 payload.length = 0.32;                                     % [m] Total bay length
-payload.diameter = 0.15;                                   % [m] Diameter of the bay
 payload.mass = 3.38512;                                    % [kg] Total bay mass
 payload.inertia = ...
     [1032892397; 5461775539; 5450863094]*1e-9;             % [kg*m^2] Total bay inertia (Body reference)
@@ -32,7 +31,6 @@ payload.noseCMod = 1.799127e-01;                           % [-] C coefficient f
 recovery = Recovery();
 
 recovery.length = 0.9469;                                  % [m] Total bay length
-recovery.diameter = 0.15;                                  % [m] Diameter of the bay
 recovery.mass = 4.05091;                                   % [kg] Total bay mass
 recovery.inertia = ...
     [1335996937; 2133707079; 2133851442]*1e-9;             % [kg*m^2] Total bay inertia (Body reference)
@@ -42,7 +40,6 @@ recovery.xCg = 0.56607;                                    % [m] Cg relative to
 electronics = Electronics();
 
 electronics.length = 0.4305;                               % [m] Total bay length
-electronics.diameter = 0.15;                               % [m] Diameter of the bay
 electronics.mass = 2.56618;                                % [kg] Total bay mass
 electronics.inertia = ...
     [909714504; 4749092145; 4715845883]*1e-9;              % [kg*m^2] Total bay inertia (Body reference)
@@ -52,7 +49,6 @@ electronics.xCg = 0.22968;                                 % [m] Cg relative to
 airbrakes = Airbrakes();
 
 airbrakes.length = 0.0548;                                 % [m] Total bay length
-airbrakes.diameter = 0.15;                                 % [m] Diameter of the bay
 airbrakes.mass = 0.99429;                                  % [kg] Total bay mass
 airbrakes.inertia = ...
     [78545425; 41163849; 41163849]*1e-9;                   % [kg*m^2] Total bay inertia (Body reference)
@@ -85,7 +81,6 @@ rear = Rear();
 
 rear.position = 1.086;                            
 rear.length = 0.5585;                                      % [m] Total bay length
-rear.diameter = 0.15;                                      % [m] Diameter of the bay
 rear.mass = 1.61926;                                       % [kg] Total bay mass
 rear.inertia = ...
     [13054773; 44192627; 44193468]*1e-9;                   % [kg*m^2] Total bay inertia (Body reference)
@@ -109,7 +104,6 @@ rear.finsMaxThicknessPosition = 0.00175;                   % [m] Fraction of cho
 pitot = Pitot();
 
 pitot.length = 0.04777;                                    % [m] Pitot tube length
-pitot.diameter = 0;                                        % [m] Pitot tube diameter
 pitot.initialConeLength = 0;                               % [m] Pitot initial conic section length
 pitot.finalConeLength = 0;                                 % [m] Pitot final conic section length
 pitot.initialConeDiameter = 0;                             % [m] Pitot initial conic section diameter