diff --git a/schema/cpacs_schema.xsd b/schema/cpacs_schema.xsd
index cb95a54..c2b6657 100644
--- a/schema/cpacs_schema.xsd
+++ b/schema/cpacs_schema.xsd
@@ -7607,37 +7607,6 @@ cpacs@dlr.de
         </xsd:complexContent>
     </xsd:complexType>
 
-    <xsd:complexType name="coneType">
-        <xsd:annotation>
-            <xsd:appinfo>
-                <sd:schemaDoc>
-                    <ddue:summary>
-                        <ddue:para>Cone</ddue:para>
-                    </ddue:summary>
-                    <ddue:remarks>
-                        <ddue:para>A cone is defined with a default volume of 1m3.</ddue:para>
-                    </ddue:remarks>
-                </sd:schemaDoc>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="complexBaseType">
-                <xsd:all>
-                    <xsd:element name="radius" minOccurs="0" default="1" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Radius (default=1) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                    <xsd:element name="height" minOccurs="0" default="0.9549297" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Height (default=0.9549297) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                </xsd:all>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
     <xsd:complexType name="configurationDefinitionsType">
         <xsd:annotation>
             <xsd:appinfo>
@@ -10855,42 +10824,6 @@ cpacs@dlr.de
         </xsd:complexContent>
     </xsd:complexType>
 
-    <xsd:complexType name="cuboidType">
-        <xsd:annotation>
-            <xsd:appinfo>
-                <sd:schemaDoc>
-                    <ddue:summary>
-                        <ddue:para>Cuboid</ddue:para>
-                        <ddue:remarks>
-                            <ddue:para>A cube is defined with a default volume of 1m3.</ddue:para>
-                        </ddue:remarks>
-                    </ddue:summary>
-                </sd:schemaDoc>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="complexBaseType">
-                <xsd:all>
-                    <xsd:element name="length" minOccurs="0" default="1" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Length (default=1) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                    <xsd:element name="width" minOccurs="0" default="1" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Width (default=1) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                    <xsd:element name="height" minOccurs="0" default="1" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Height (default=1) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                </xsd:all>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
     <xsd:complexType name="curveParamPointMapType">
         <xsd:annotation>
             <xsd:appinfo>
@@ -11273,37 +11206,6 @@ cpacs@dlr.de
         </xsd:complexContent>
     </xsd:complexType>
 
-    <xsd:complexType name="cylinderType">
-        <xsd:annotation>
-            <xsd:appinfo>
-                <sd:schemaDoc>
-                    <ddue:summary>
-                        <ddue:para>Cylinder</ddue:para>
-                    </ddue:summary>
-                    <ddue:remarks>
-                        <ddue:para>A cylinder is defined with a default volume of 1m3.</ddue:para>
-                    </ddue:remarks>
-                </sd:schemaDoc>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="complexBaseType">
-                <xsd:all>
-                    <xsd:element name="radius" minOccurs="0" default="1" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Radius (default=1) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                    <xsd:element name="height" minOccurs="0" default="0.31831" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Height (default=1/pi) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                </xsd:all>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
     <xsd:complexType name="dampingDerivativesRatesArrayType">
         <xsd:annotation>
             <xsd:appinfo>
@@ -18154,10 +18056,10 @@ The fuel tank volume type should also be used for the wing fuel tank</xsd:docume
         <xsd:complexContent>
             <xsd:extension base="complexBaseType">
                 <xsd:choice>
-                    <xsd:element name="cuboid" type="cuboidType"/>
-                    <xsd:element name="cone" type="coneType"/>
-                    <xsd:element name="sphere" type="sphereType"/>
-                    <xsd:element name="cylinder" type="cylinderType"/>
+                    <xsd:element name="cuboid" type="xsd:string"/>
+                    <xsd:element name="cone" type="xsd:string"/>
+                    <xsd:element name="sphere" type="xsd:string"/>
+                    <xsd:element name="cylinder" type="xsd:string"/>
                     <xsd:element name="genericGeometryComponent" type="genericGeometryComponentType"/>
                 </xsd:choice>
             </xsd:extension>
@@ -33953,32 +33855,6 @@ The fuel tank volume type should also be used for the wing fuel tank</xsd:docume
         </xsd:simpleContent>
     </xsd:complexType>
 
-    <xsd:complexType name="sphereType">
-        <xsd:annotation>
-            <xsd:appinfo>
-                <sd:schemaDoc>
-                    <ddue:summary>
-                        <ddue:para>Sphere</ddue:para>
-                    </ddue:summary>
-                    <ddue:remarks>
-                        <ddue:para>A sphere is defined with a default volume of 1m3.</ddue:para>
-                    </ddue:remarks>
-                </sd:schemaDoc>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="complexBaseType">
-                <xsd:all>
-                    <xsd:element name="radius" minOccurs="0" default="0.62035" type="doubleBaseType">
-                        <xsd:annotation>
-                            <xsd:documentation>Radius (default=0.62035) [m]</xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                </xsd:all>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
     <xsd:complexType name="spoilersType">
         <xsd:annotation>
             <xsd:appinfo>