diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 221bc3ddc..943078681 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -600,6 +600,16 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====TypeOfValue unique========================== -->
+		<xsd:unique name="TypeOfValue_Unique">
+			<xsd:selector xpath="values/TypeOfValue"/>
+			<xsd:field xpath="@id"/>
+		</xsd:unique>
+		<!-- =====TypeOfValue Key========================== -->
+		<xsd:key name="TypeOfValue_Key">
+			<xsd:selector xpath=".//values/TypeOfValue"/>
+			<xsd:field xpath="@id"/>
+		</xsd:key>
 		<!-- =====ValueSet unique========================== -->
 		<xsd:unique name="ValueSet_UniqueBy_Id_Version">
 			<xsd:annotation>
@@ -13017,6 +13027,7 @@
 		</xsd:key>
 		<!-- =====WheelchairVehicle ================================ -->
 		<!-- =====WheelchairVehicle unique========================== -->
+		<!--This section can be deleted at the next update as WheelchairVehicle is marked deprecated since v2.0-->
 		<xsd:unique name="WheelchairVehicle_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [WheelchairVehicle Id + Version] must be unique within document.</xsd:documentation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
index d6c4ecf10..14c9af51b 100644
--- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
@@ -175,14 +175,6 @@ Rail transport, Roads and Road transport
 				</xsd:restriction>
 			</xsd:complexContent>
 		</xsd:complexType>
-		<xsd:unique name="TypeOfValue_Unique">
-			<xsd:selector xpath="values/TypeOfValue/Id"/>
-			<xsd:field xpath="."/>
-		</xsd:unique>
-		<xsd:key name="TypeOfValue_Key">
-			<xsd:selector xpath="values/TypeOfValue/Id"/>
-			<xsd:field xpath="."/>
-		</xsd:key>
 	</xsd:element>
 	<xsd:complexType name="ValueSet_VersionStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
index 36b083f57..548fe8ba7 100644
--- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
@@ -126,11 +126,6 @@ Rail transport, Roads and Road transport
 				</xsd:restriction>
 			</xsd:complexContent>
 		</xsd:complexType>
-		<!-- 
-		<xsd:unique name="SfUniqueLineId">
-			<xsd:selector xpath=".//netex:lines/Line"/>
-			<xsd:field xpath="Id"/>
-		</xsd:unique> -->
 	</xsd:element>
 	<xsd:complexType name="Service_VersionFrameStructure">
 		<xsd:annotation>