diff --git a/scripts/README.md b/scripts/README.md
new file mode 100644
index 000000000..1161e2208
--- /dev/null
+++ b/scripts/README.md
@@ -0,0 +1,8 @@
+## README
+
+# XML Schema XPath selector cleaning
+
+Executed via `python scripts/xsd_selector_clear.py xsd`
+Filters `NeTEx_publication.xsd` for unknown elements that are being used in xsd:selector for xsd:key, xsd:keyref, and xsd:unique.
+Elements that are not in the schema, cannot be referenced, hence they cannot be found in a document.
+It also resolves issues with extra spaces in the xsd:selector.
diff --git a/scripts/analyse-refs-2.py b/scripts/analyse-refs-2.py
new file mode 100644
index 000000000..d23b978af
--- /dev/null
+++ b/scripts/analyse-refs-2.py
@@ -0,0 +1,157 @@
+from lxml import etree
+from pathlib import Path
+import copy
+
+XSD_ROOT = Path("xsd")
+XSD_NS = {"xsd": "http://www.w3.org/2001/XMLSchema"}
+
+def get_version_of_object_ref_attrs(xsd_file: Path):
+    """Return all <xsd:attribute> and similar children under VersionOfObjectRefStructure/extension."""
+    tree = etree.parse(str(xsd_file))
+    ext = tree.xpath(
+        "//xsd:complexType[@name='VersionOfObjectRefStructure']/xsd:simpleContent/xsd:extension",
+        namespaces=XSD_NS,
+    )
+    if not ext:
+        raise ValueError("VersionOfObjectRefStructure niet gevonden of geen extension")
+    return [copy.deepcopy(c) for c in ext[0] if isinstance(c.tag, str)]
+
+def collect_ref_elements(root_dir: Path):
+    """Collect (xsd_file, type_name) for all complexTypes ending with RefStructure."""
+    results = []
+    for f in root_dir.rglob("*.xsd"):
+        if 'xsd/netex' in str(f):
+            tree = etree.parse(str(f))
+            for ctype in tree.xpath("//xsd:element[substring(@name, string-length(@name) - string-length('Ref') +1) = 'Ref']", namespaces=XSD_NS):
+                name = ctype.get("name")
+                yield (f, name)
+
+def collect_ref_complextypes(root_dir: Path):
+    """Collect (xsd_file, type_name) for all complexTypes ending with RefStructure."""
+    results = []
+    for f in root_dir.rglob("*.xsd"):
+        tree = etree.parse(str(f))
+        for ctype in tree.xpath("//xsd:complexType[substring(@name, string-length(@name) - string-length('RefStructure') +1) = 'RefStructure']", namespaces=XSD_NS):
+            name = ctype.get("name")
+            yield (f, name)
+
+def add_missing_attrs(restriction_elem, version_attrs):
+    """Ensure all attributes from VersionOfObjectRefStructure exist, append if missing."""
+    existing_names = {a.get("name") for a in restriction_elem.findall("xsd:attribute", XSD_NS)}
+    for attr in version_attrs:
+        if attr.tag.endswith("attribute"):
+            if attr.get("name") not in existing_names:
+                restriction_elem.append(copy.deepcopy(attr))
+
+def ensure_nameofrefclass(restriction_elem, type_name: str):
+    """Ensure nameOfRefClass attribute exists with correct type and default."""
+    existing = restriction_elem.xpath("xsd:attribute[@name='nameOfRefClass']", namespaces=XSD_NS)
+    if existing:
+        return
+    # derive "XXX" from "ScheduledStopPointRefStructure" → "ScheduledStopPoint"
+    base = type_name.replace("RefStructure", "")
+    attr = etree.Element(f"{{{XSD_NS['xsd']}}}attribute")
+    attr.set("name", "nameOfRefClass")
+    attr.set("type", f"NameOfClass{base}")
+    attr.set("default", base)
+    restriction_elem.append(attr)
+
+def process_refstructure_complex_types(xsd_file, version_attrs, valid_ref_classes):
+    """Replace extension with restriction for RefStructures that inherit from VersionOfObjectRefStructure."""
+    tree = etree.parse(str(xsd_file))
+    modified = False
+
+    for ctype in tree.xpath("//xsd:complexType[substring(@name, string-length(@name) - string-length('RefStructure') +1) = 'RefStructure']", namespaces=XSD_NS):
+        name = ctype.get("name")
+        if name not in valid_ref_classes:
+            continue  # skip unrelated RefStructures
+
+        ext = ctype.xpath(".//xsd:extension", namespaces=XSD_NS)
+        if not ext:
+            continue
+        ext_elem = ext[0]
+        base = ext_elem.get("base")
+
+        restriction = etree.Element(f"{{{XSD_NS['xsd']}}}restriction", base=base)
+
+        # Kopieer bestaande attributen uit huidige extension
+        for child in ext_elem:
+            restriction.append(copy.deepcopy(child))
+
+        # Voeg alle ontbrekende attributen van VersionOfObjectRefStructure toe
+        add_missing_attrs(restriction, version_attrs)
+
+        # Zorg voor nameOfRefClass
+        ensure_nameofrefclass(restriction, name)
+
+        # Vervang in simpleContent
+        simple_content = ctype.find("xsd:simpleContent", XSD_NS)
+        if simple_content is not None:
+            for child in list(simple_content):
+                simple_content.remove(child)
+            simple_content.append(restriction)
+            modified = True
+
+    if modified:
+        tree.write(str(xsd_file), encoding="utf-8", xml_declaration=True, pretty_print=True)
+    return modified
+
+
+def has_extension(xsd_file: Path, type_name: str) -> str | None:
+    """
+    Check if a complexType with given name uses an <xsd:extension>.
+    Returns the base type if found, else None.
+    """
+    tree = etree.parse(str(xsd_file))
+    ext = tree.xpath(
+        f"//xsd:complexType[@name='{type_name}']//xsd:extension",
+        namespaces=XSD_NS
+    )
+    if ext:
+        return ext[0].get("base")
+    return None
+
+def main():
+    version_attrs = get_version_of_object_ref_attrs(
+        XSD_ROOT / "netex_framework/netex_responsibility/netex_relationship_support.xsd"
+    )
+
+    # Hier zou jouw analyzer gebruikt worden om te bepalen welke RefStructures erven van VersionOfObjectRefStructure
+    # Voorbeeld: valid_ref_classes = {"ScheduledStopPointRefStructure", "StopPlaceRefStructure", ...}
+    # → hier voorlopig als placeholder
+    from dependencygraph import XSDDependencyAnalyzer  # vervang door jouw echte analyzer
+    ref_elements = set(collect_ref_elements(XSD_ROOT))
+
+    analyzer = XSDDependencyAnalyzer()
+
+    analyzer.parse_schemas([XSD_ROOT])
+    analyzer.build_dependency_graph()
+
+    all_complex_types = set([])
+
+    for xsd_file, name in ref_elements:
+        type_chain = analyzer._get_type_chain(name)
+        if "VersionOfObjectRefStructure" not in type_chain:
+            continue
+        for x in type_chain:
+            all_complex_types.add(x)
+
+    for xsd_file, name in collect_ref_complextypes(XSD_ROOT):
+        if name in all_complex_types:
+            base = has_extension(xsd_file, name)
+            if base:
+                pass
+                # print(f"{xsd_file}: {name} (extends {base})")
+            else:
+                print(name)
+
+    # Pas enkel de relevante bestanden aan
+    # for xsd_file in XSD_ROOT.rglob("*.xsd"):
+    #     if not str(xsd_file).startswith("xsd/netex"):
+    #         continue
+    #    if process_refstructure_complex_types(xsd_file, version_attrs, valid_ref_classes):
+    #        print(f"[MODIFIED] {xsd_file}")
+
+if __name__ == "__main__":
+    main()
+
diff --git a/scripts/dependencygraph.py b/scripts/dependencygraph.py
new file mode 100644
index 000000000..4d89ada9a
--- /dev/null
+++ b/scripts/dependencygraph.py
@@ -0,0 +1,487 @@
+"""
+XSD Schema Dependency Analyzer
+Builds an inverted dependency graph showing which elements depend on a given element
+through type hierarchy (extension/restriction relationships).
+"""
+
+import xml.etree.ElementTree as ET
+from pathlib import Path
+from typing import Dict, Set, List
+from collections import defaultdict
+import json
+
+
+class XSDDependencyAnalyzer:
+    """Analyzes XSD schemas to build inverted dependency graphs based on type hierarchies."""
+
+    XSD_NS = "http://www.w3.org/2001/XMLSchema"
+
+    def __init__(self):
+        # Element name -> its type name (or inline type identifier)
+        self.element_to_type = {}
+
+        # Type name -> its base type name (for extensions/restrictions)
+        self.type_hierarchy = {}
+
+        # Element name -> set of elements that depend on it (through type hierarchy)
+        self.element_dependencies = defaultdict(set)
+
+        # For debugging: store type derivation info
+        self.type_info = {}
+        
+        # Abstract Elements
+        self.abstract_elements = set([])
+
+    def parse_schemas(self, schema_paths: List[Path]) -> None:
+        """Parse all XSD schemas from the given paths."""
+        for path in schema_paths:
+            if path.is_file():
+                self._parse_schema_file(path)
+            elif path.is_dir():
+                for xsd_file in path.rglob("*.xsd"):
+                    self._parse_schema_file(xsd_file)
+
+    def _parse_schema_file(self, filepath: Path) -> None:
+        """Parse a single XSD schema file."""
+        try:
+            tree = ET.parse(filepath)
+            root = tree.getroot()
+
+            # First pass: collect all type definitions
+            self._extract_types(root)
+
+            # Second pass: collect elements and their types
+            self._extract_elements(root)
+
+        except Exception as e:
+            print(f"Error parsing {filepath}: {e}")
+
+    def _extract_types(self, root: ET.Element) -> None:
+        """Extract all type definitions and their base types."""
+        # Complex types
+        for ctype in root.findall(f".//{{{self.XSD_NS}}}complexType"):
+            name = ctype.get('name')
+            if not name:
+                continue
+
+            base_type = None
+            derivation = None
+
+            # Check for extension
+            extension = ctype.find(f".//{{{self.XSD_NS}}}extension")
+            if extension is not None:
+                base_type = self._strip_ns(extension.get('base', ''))
+                derivation = 'extension'
+
+            # Check for restriction
+            restriction = ctype.find(f".//{{{self.XSD_NS}}}restriction")
+            if restriction is not None:
+                base_type = self._strip_ns(restriction.get('base', ''))
+                derivation = 'restriction'
+
+            if base_type:
+                self.type_hierarchy[name] = base_type
+                self.type_info[name] = {'base': base_type, 'derivation': derivation}
+
+        # Simple types
+        for stype in root.findall(f".//{{{self.XSD_NS}}}simpleType"):
+            name = stype.get('name')
+            if not name:
+                continue
+
+            restriction = stype.find(f"{{{self.XSD_NS}}}restriction")
+            if restriction is not None:
+                base_type = self._strip_ns(restriction.get('base', ''))
+                self.type_hierarchy[name] = base_type
+                self.type_info[name] = {'base': base_type, 'derivation': 'restriction'}
+
+    def _extract_elements(self, root: ET.Element) -> None:
+        """Extract all element definitions and map them to their types."""
+        for elem in root.findall(f".//{{{self.XSD_NS}}}element"):
+            name = elem.get('name')
+            if not name:
+                continue
+
+            abstract = elem.get('abstract', False)
+            if abstract:
+                self.abstract_elements.add(name)
+
+            # Check for direct type reference
+            type_ref = elem.get('type')
+            if type_ref:
+                self.element_to_type[name] = self._strip_ns(type_ref)
+                continue
+
+            # Check for inline complex type
+            complex_type = elem.find(f"{{{self.XSD_NS}}}complexType")
+            if complex_type is not None:
+                # Look for restriction or extension in inline type
+                restriction = complex_type.find(f".//{{{self.XSD_NS}}}restriction")
+                extension = complex_type.find(f".//{{{self.XSD_NS}}}extension")
+
+                if restriction is not None:
+                    base_type = self._strip_ns(restriction.get('base', ''))
+                    if base_type:
+                        # Create a synthetic type name for the inline type
+                        inline_type_name = f"{name}_InlineType"
+                        self.element_to_type[name] = inline_type_name
+                        self.type_hierarchy[inline_type_name] = base_type
+                        self.type_info[inline_type_name] = {'base': base_type, 'derivation': 'restriction'}
+
+                elif extension is not None:
+                    base_type = self._strip_ns(extension.get('base', ''))
+                    if base_type:
+                        inline_type_name = f"{name}_InlineType"
+                        self.element_to_type[name] = inline_type_name
+                        self.type_hierarchy[inline_type_name] = base_type
+                        self.type_info[inline_type_name] = {'base': base_type, 'derivation': 'extension'}
+
+    def _strip_ns(self, qname: str) -> str:
+        """Strip namespace prefix from a qualified name."""
+        if ':' in qname:
+            return qname.split(':', 1)[1]
+        return qname
+
+    def build_dependency_graph(self) -> None:
+        """Build the inverted dependency graph with transitive relationships through element-specific types."""
+        # First, build direct dependencies between element-specific types
+        direct_deps = defaultdict(set)
+
+        for elem_name in self.element_to_type.keys():
+            elem_specific_types = self._get_element_specific_types(elem_name)
+            if not elem_specific_types:
+                continue
+
+            for other_elem_name in self.element_to_type.keys():
+                if other_elem_name == elem_name:
+                    continue
+
+                other_specific_types = self._get_element_specific_types(other_elem_name)
+
+                # Check if any of the other element's specific types extend this element's specific types
+                for other_spec_type in other_specific_types:
+                    base = self.type_hierarchy.get(other_spec_type)
+                    if base and base in elem_specific_types:
+                        direct_deps[elem_name].add(other_elem_name)
+                        break
+
+        # Now compute transitive closure: if B depends on A, and C depends on B, then C depends on A
+        self.element_dependencies = self._compute_transitive_closure(direct_deps)
+
+    def _compute_transitive_closure(self, direct_deps: Dict[str, Set[str]]) -> Dict[str, Set[str]]:
+        """Compute transitive closure of dependencies."""
+        result = defaultdict(set)
+
+        # Start with direct dependencies
+        for elem, deps in direct_deps.items():
+            result[elem] = set(deps)
+
+        # Add transitive dependencies
+        changed = True
+        while changed:
+            changed = False
+            for elem in list(result.keys()):
+                current_deps = set(result[elem])
+                for dep in current_deps:
+                    # If dep has its own dependencies, add them to elem's dependencies
+                    if dep in result:
+                        for transitive_dep in result[dep]:
+                            if transitive_dep not in result[elem]:
+                                result[elem].add(transitive_dep)
+                                changed = True
+
+        return result
+
+    def _get_element_specific_types(self, elem_name: str) -> Set[str]:
+        """Get types that are specific to this element (contain the element name in the type name)."""
+        specific_types = set()
+
+        elem_type = self.element_to_type.get(elem_name)
+        if not elem_type:
+            return specific_types
+
+        # Start with the element's direct type
+        current_type = elem_type
+
+        # Walk up the type hierarchy and collect types that contain the element name
+        while current_type:
+            # Check if this type name contains the element name
+            # For example: "ScheduledStopPoint_VersionStructure" contains "ScheduledStopPoint"
+            if elem_name in current_type:
+                specific_types.add(current_type)
+            else:
+                # Stop when we hit a generic type that doesn't contain the element name
+                break
+
+            current_type = self.type_hierarchy.get(current_type)
+
+        return specific_types
+
+    def _get_type_chain(self, elem_name: str) -> List[str]:
+        """Get the complete type hierarchy chain for an element (most specific to most general)."""
+        chain = []
+
+        current_type = self.element_to_type.get(elem_name)
+        if not current_type:
+            return chain
+
+        # Follow the type hierarchy up
+        while current_type:
+            chain.append(current_type)
+            current_type = self.type_hierarchy.get(current_type)
+
+        return chain
+
+    def _depends_on(self, derived_chain: List[str], base_chain: List[str]) -> bool:
+        """Check if derived_chain extends base_chain through shared type hierarchy."""
+        if not base_chain or not derived_chain:
+            return False
+
+        # Check if any type from base_chain appears in derived_chain
+        # If it does, and there are types before it in derived_chain,
+        # then derived depends on base
+        for base_type in base_chain:
+            if base_type in derived_chain:
+                derived_idx = derived_chain.index(base_type)
+                # If the shared type appears later in derived chain (index > 0),
+                # it means derived extends/restricts through this shared type
+                if derived_idx > 0:
+                    return True
+
+        return False
+
+    def get_dependents(self, element_name: str) -> Set[str]:
+        """Get all elements that depend on the given element."""
+        return self.element_dependencies.get(element_name, set())
+
+    def get_dependency_path(self, base_elem: str, derived_elem: str) -> str:
+        """Get the type hierarchy path showing the dependency (direct or transitive)."""
+        base_specific_types = self._get_element_specific_types(base_elem)
+        derived_specific_types = self._get_element_specific_types(derived_elem)
+
+        if not base_specific_types or not derived_specific_types:
+            return "No element-specific type information"
+
+        # Check for direct connection
+        for derived_type in derived_specific_types:
+            base_of_derived = self.type_hierarchy.get(derived_type)
+            if base_of_derived and base_of_derived in base_specific_types:
+                derivation = self.type_info.get(derived_type, {}).get('derivation', 'unknown')
+                return f"{derived_type} --[{derivation}]--> {base_of_derived} (direct)"
+
+        # Check for transitive connection through intermediate elements
+        # Find elements that derived depends on and that depend on base
+        for intermediate in self.element_to_type.keys():
+            if intermediate == base_elem or intermediate == derived_elem:
+                continue
+
+            intermediate_specific = self._get_element_specific_types(intermediate)
+
+            # Check if derived extends intermediate
+            derived_extends_intermediate = False
+            for derived_type in derived_specific_types:
+                base_of_derived = self.type_hierarchy.get(derived_type)
+                if base_of_derived and base_of_derived in intermediate_specific:
+                    derived_extends_intermediate = True
+                    break
+
+            # Check if intermediate extends base
+            intermediate_extends_base = False
+            for inter_type in intermediate_specific:
+                base_of_inter = self.type_hierarchy.get(inter_type)
+                if base_of_inter and base_of_inter in base_specific_types:
+                    intermediate_extends_base = True
+                    break
+
+            if derived_extends_intermediate and intermediate_extends_base:
+                return f"via {intermediate} (transitive)"
+
+        return "No connection found"
+
+    def print_all_dependencies(self) -> None:
+        """Print dependency information for all elements."""
+        print("\n" + "="*80)
+        print("INVERTED DEPENDENCY GRAPH")
+        print("="*80)
+
+        for elem_name in sorted(self.element_to_type.keys()):
+            dependents = self.get_dependents(elem_name)
+            if dependents:
+                print(f"\n{elem_name}:")
+                print(f"  Type chain: {' → '.join(self._get_type_chain(elem_name))}")
+                print(f"  Depended on by:")
+                for dep in sorted(dependents):
+                    path = self.get_dependency_path(elem_name, dep)
+                    print(f"    - {dep}")
+                    print(f"      via: {path}")
+
+    def print_dependencies(self, element_name: str) -> None:
+        """Print dependency information for a specific element."""
+        if element_name not in self.element_to_type:
+            print(f"Element '{element_name}' not found in schemas.")
+            return
+
+        print(f"\n{'='*80}")
+        print(f"Dependencies for: {element_name}")
+        print(f"{'='*80}")
+
+        type_chain = self._get_type_chain(element_name)
+        print(f"\nType chain: {' → '.join(type_chain)}")
+
+        # Show which types are considered "specific" to this element
+        specific_types = self._get_element_specific_types(element_name)
+        if specific_types:
+            print(f"\nElement-specific types: {', '.join(sorted(specific_types))}")
+
+        dependents = self.get_dependents(element_name)
+        if dependents:
+            print(f"\nElements that depend on '{element_name}':")
+            for dep in sorted(dependents):
+                path = self.get_dependency_path(element_name, dep)
+                print(f"  - {dep}")
+                print(f"    via: {path}")
+        else:
+            print(f"\nNo elements depend on '{element_name}'")
+            print("(Only showing dependencies on element-specific types, not shared ancestor types)")
+
+    def export_to_json(self, output_path: Path) -> None:
+        """Export the dependency graph to JSON."""
+        result = {}
+
+        for elem_name in sorted(self.element_to_type.keys()):
+            dependents = self.get_dependents(elem_name)
+            if dependents or elem_name:  # Include all elements
+                result[elem_name] = {
+                    'type_chain': self._get_type_chain(elem_name),
+                    'depended_on_by': [
+                        {
+                            'element': dep,
+                            'via_type_chain': self.get_dependency_path(elem_name, dep)
+                        }
+                        for dep in sorted(dependents)
+                    ]
+                }
+
+        with open(output_path, 'w') as f:
+            json.dump(result, f, indent=2)
+
+        print(f"\n{'='*80}")
+        print(f"Exported dependency graph to: {output_path}")
+        print(f"{'='*80}")
+
+    def get_simple_graph(self, root_type: str = None) -> Dict[str, List[str]]:
+        """
+        Get a simple dictionary mapping element names to lists of dependent elements.
+
+        Args:
+            root_type: If specified, only include elements whose type chain ends with this type.
+                      For example, 'EntityStructure' to filter entities.
+
+        Returns:
+            Dict mapping element_name -> [list of dependent element names]
+        """
+        result = {}
+
+        for elem_name in sorted(self.element_to_type.keys()):
+            # Filter by root type if specified
+            if root_type:
+                type_chain = self._get_type_chain(elem_name)
+                if not type_chain or type_chain[-1] != root_type:
+                    continue
+
+            dependents = self.get_dependents(elem_name)
+            result[elem_name] = sorted(dependents)
+
+        return result
+
+    def export_simple_graph(self, output_path: Path, root_type: str = None) -> None:
+        """
+        Export a simple dependency graph as a clean dictionary.
+
+        Args:
+            output_path: Path to save the JSON file
+            root_type: If specified, only include elements whose type chain ends with this type
+        """
+        graph = self.get_simple_graph(root_type)
+
+        with open(output_path, 'w') as f:
+            json.dump({'graph': graph, 'abstract': list(self.abstract_elements)}, f, indent=2)
+
+        filter_msg = f" (filtered to {root_type})" if root_type else ""
+        print(f"\n{'='*80}")
+        print(f"Exported simple dependency graph to: {output_path}{filter_msg}")
+        print(f"Total elements: {len(graph)}")
+        print(f"{'='*80}")
+
+
+def main():
+    """Example usage."""
+    import sys
+
+    if len(sys.argv) < 2:
+        print("Usage: python xsd_analyzer.py <schema_path> [element_name]")
+        print("  schema_path: Path to XSD file or directory")
+        print("  element_name: (optional) Specific element to analyze")
+        print("\nIf no element_name is provided, shows dependencies for ALL elements")
+        sys.exit(1)
+
+    schema_path = Path(sys.argv[1])
+    element_name = sys.argv[2] if len(sys.argv) > 2 else None
+
+    # Create analyzer
+    analyzer = XSDDependencyAnalyzer()
+
+    # Parse schemas
+    print(f"Parsing schemas from: {schema_path}")
+    if schema_path.is_file():
+        analyzer.parse_schemas([schema_path])
+    else:
+        analyzer.parse_schemas([schema_path])
+
+    print(f"Found {len(analyzer.element_to_type)} elements")
+    print(f"Found {len(analyzer.type_hierarchy)} type relationships")
+
+    # Build dependency graph
+    print("Building dependency graph...")
+    analyzer.build_dependency_graph()
+
+    # Print results
+    # if element_name:
+    #    analyzer.print_dependencies(element_name)
+    # else:
+    #    analyzer.print_all_dependencies()
+    
+    # Export detailed JSON
+    # output_path = Path("xsd_dependencies.json")
+    # analyzer.export_to_json(output_path)
+
+    # Export simple graph (all elements)
+    simple_path = Path("xsd_simple_graph.json")
+    analyzer.export_simple_graph(simple_path)
+
+    # Export simple graph filtered to EntityStructure
+    # entity_path = Path("xsd_entity_graph.json")
+    # analyzer.export_simple_graph(entity_path, root_type="EntityStructure")
+
+    # Show example of using the simple graph
+    print("\nExample: Simple graph structure")
+    print("="*80)
+    graph = analyzer.get_simple_graph(root_type="EntityStructure")
+
+    # Show a few examples
+    shown = 0
+    for elem, deps in list(graph.items())[:3]:
+        if deps:  # Only show elements with dependencies
+            print(f"graph['{elem}'] = {deps}")
+            shown += 1
+            if shown >= 3:
+                break
+
+    print(analyzer._get_type_chain('ServiceLink'))
+    print(analyzer._get_type_chain('TimingLink'))
+    print(analyzer._get_type_chain('StandardFareTable'))
+    print(analyzer._get_type_chain('ParkingTariff'))
+    print(analyzer._get_type_chain('ScheduledStopPointRef'))
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/xsd_selector_clear.py b/scripts/xsd_selector_clear.py
new file mode 100644
index 000000000..f6289fc87
--- /dev/null
+++ b/scripts/xsd_selector_clear.py
@@ -0,0 +1,147 @@
+from pathlib import Path
+from lxml import etree
+import json
+import sys
+
+# --- CONFIG ---
+NS = {"xsd": "http://www.w3.org/2001/XMLSchema"}
+BASE_DIR = Path(sys.argv[1])  # map met alle XSD bestanden
+INPUT_XSD = OUTPUT_XSD = BASE_DIR / "NeTEx_publication.xsd"     # bestand dat je wilt herschrijven
+REPORT_JSON = "report.json"
+
+# --- 1. Verzamel alle element-namen uit alle XSD's (recursief, inclusief nested, negeer abstract) ---
+all_elements = set()
+for xsd_file in BASE_DIR.rglob("*.xsd"):
+    tree = etree.parse(str(xsd_file))
+    root = tree.getroot()
+    for elem in root.findall(".//xsd:element", namespaces=NS):
+        if elem.get("abstract") == "true":
+            continue  # negeer abstract elements
+        name = elem.get("name")
+        if name:
+            all_elements.add(name)
+
+print(f"Totale elementen gevonden (excl. abstract): {len(all_elements)}")
+
+# --- 2. Open het doelbestand ---
+tree = etree.parse(str(INPUT_XSD))
+root = tree.getroot()
+
+# --- 3. Prepare report dictionary ---
+report = {"removed_selectors": [], "removed_elements": [], "removed_comments": []}
+
+# --- 4. Functie om selector xpath te filteren ---
+def filter_selector(node):
+    selector = node.find("xsd:selector", namespaces=NS)
+    if selector is None:
+        return False  # geen selector
+    xpath_expr = selector.get("xpath")
+    if not xpath_expr:
+        return False
+    exprs = [e.strip() for e in xpath_expr.split("|")]
+    kept_exprs = []
+    removed_exprs = []
+    for e in exprs:
+        # strip leading .// en namespace prefix
+        e_clean = e.replace(".//", "").split(":")[-1]
+        if e_clean in all_elements:
+            kept_exprs.append(e)
+        else:
+            removed_exprs.append(e)
+    if removed_exprs:
+        report["removed_selectors"].append({
+            "parent_name": node.get("name"),
+            "removed_expressions": removed_exprs
+        })
+    selector.set("xpath", " | ".join(kept_exprs))  # altijd bijwerken
+    print(f"[DEBUG] Node: {node.tag}, name: {node.get('name')}, kept expressions: {kept_exprs}")
+    return bool(kept_exprs)  # True als minstens één expression overblijft
+
+# --- 5. Helper: verwijder alle comments direct boven een node ---
+def remove_comments_above(node):
+    parent = node.getparent()
+    prev = node.getprevious()
+    removed_comments = []
+    while prev is not None and isinstance(prev, etree._Comment):
+        removed_comments.append(prev.text)
+        parent.remove(prev)
+        prev = node.getprevious()  # update na verwijderen
+    if removed_comments:
+        report["removed_comments"].append({
+            "parent_name": node.get("name"),
+            "removed_comments": removed_comments
+        })
+        print(f"[DEBUG] Removed comment(s) above '{node.get('name')}': {removed_comments}")
+
+# --- 6. Eerste pass: filter key, unique, keyref selectors ---
+for tag in ["key", "unique"]:
+    for node in root.findall(f".//xsd:{tag}", namespaces=NS):
+        has_expr = filter_selector(node)
+        if not has_expr:
+            remove_comments_above(node)
+            report["removed_elements"].append({
+                "type": tag,
+                "name": node.get("name"),
+                "reason": "all selector expressions removed"
+            })
+            print(f"[DEBUG] Removing {tag} '{node.get('name')}' (no expressions left)")
+            node.getparent().remove(node)
+
+for kr in root.findall(".//xsd:keyref", namespaces=NS):
+    has_expr = filter_selector(kr)
+    refer_name = kr.get("refer")
+    if not has_expr or refer_name is None:
+        remove_comments_above(kr)
+        report["removed_elements"].append({
+            "type": "keyref",
+            "name": kr.get("name"),
+            "reason": "all selector expressions removed or no refer"
+        })
+        print(f"[DEBUG] Removing keyref '{kr.get('name')}' (no expressions or no refer)")
+        kr.getparent().remove(kr)
+
+# Tweede pass: verwijder keys die nergens meer door keyrefs gebruikt worden
+for k in root.findall(".//xsd:key", namespaces=NS):
+    kname = k.get("name")  # gebruik exact dezelfde string als in refer
+    still_used = False
+    for kr in root.findall(".//xsd:keyref", namespaces=NS):
+        if kr.get("refer") == kname or kr.get("refer") == f"netex:{kname}":
+            still_used = True
+            break
+    if not still_used:
+        remove_comments_above(k)
+        report["removed_elements"].append({
+            "type": "key",
+            "name": kname,
+            "reason": "no keyrefs reference this key anymore"
+        })
+        print(f"[DEBUG] Removing key '{kname}' (no keyrefs reference it)")
+        k.getparent().remove(k)
+
+# --- 3e pass: verwijder keyrefs waarvan de refererende key is verwijderd ---
+existing_keys = {k.get("name") for k in root.findall(".//xsd:key", namespaces=NS)}
+
+for kr in root.findall(".//xsd:keyref", namespaces=NS):
+    refer = kr.get("refer")
+    if refer:
+        local_refer = refer.split(":")[-1]  # simpele prefix strip
+        if local_refer not in existing_keys:
+            remove_comments_above(kr)
+            report["removed_elements"].append({
+                "type": "keyref",
+                "name": kr.get("name"),
+                "reason": f"referenced key '{refer}' was removed"
+            })
+            print(f"[DEBUG] Removing keyref '{kr.get('name')}' (referenced key '{refer}' removed)")
+            kr.getparent().remove(kr)
+
+# --- 8. Schrijf het XSD-bestand opnieuw ---
+tree.write(str(OUTPUT_XSD), encoding="utf-8", xml_declaration=True, pretty_print=True)
+
+# --- 9. Schrijf JSON rapport ---
+# with open(REPORT_JSON, "w", encoding="utf-8") as jf:
+#    json.dump(report, jf, indent=2, ensure_ascii=False, default=str)
+
+# print(f"Verwerkt XSD opgeslagen als {OUTPUT_XSD}")
+# print(f"JSON rapport opgeslagen als {REPORT_JSON}")
+
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 6d3fb4286..cdf0125d6 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -324,13 +324,6 @@
 			<xsd:selector xpath=".//netex:Codespace"/>
 			<xsd:field xpath="@id"/>
 		</xsd:key>
-		<!-- ===== Codespace Xmlns ============================== -->
-		<xsd:key name="Codespace_AnyVersionedKey_Xmlns">
-			<!-- Correction AURIGE : netex: namespace needed -->
-			<!--		<xsd:selector xpath=".//netex:Codespace/Xmlns"/> -->
-			<xsd:selector xpath=".//netex:Codespace/netex:Xmlns"/>
-			<xsd:field xpath="."/>
-		</xsd:key>
 		<!-- =====DataSource=unique========================== -->
 		<xsd:unique name="DataSource_UniqueBy_Id_Version">
 			<xsd:annotation>
@@ -346,7 +339,7 @@
 			<xsd:field xpath="@ref"/>
 		</xsd:keyref>
 		<xsd:keyref name="DataSourceRef_AnyKeyRef" refer="netex:DataSource_AnyKey">
-			<xsd:selector xpath=".//netex:AlternativeName | .//netex:Codespace | .//netex:Access | .//netex:AccessEquipment | .//netex:AccessRightParameterAssignment | .//netex:AccessSpace | .//netex:AccessVehicleEquipment | .//netex:AccessZone | .//netex:AccountableElement | .//netex:ActivatedEquipment | .//netex:ActivationAssignment | .//netex:ActivationLink | .//netex:ActivationPoint | .//netex:AddressablePlace | .//netex:AdministrativeZone | .//netex:AllowedLineDirection | .//netex:AmountOfPriceUnitProduct | .//netex:AssistanceBookingService | .//netex:AssistanceService | .//netex:Authority | .//netex:AvailabilityCondition | .//netex:BeaconPoint | .//netex:Blacklist | .//netex:Block | .//netex:BlockPart | .//netex:BoardingPosition | .//netex:BorderPoint | .//netex:Branding | .//netex:Cancelling | .//netex:CappedDiscountRight | .//netex:CappingRule | .//netex:CateringService | .//netex:ChargingMoment | .//netex:ChargingPolicy | .//netex:CheckConstraint | .//netex:CheckConstraintDelay | .//netex:CheckConstraintThroughput | .//netex:ClassOfUse | .//netex:CommercialProfile | .//netex:CommonSection | .//netex:CommunicationService | .//netex:CompanionProfile | .//netex:ComplaintsService | .//netex:ComplexFeature | .//netex:ComplexFeatureProjection | .//netex:CompositeFrame | .//netex:CompoundBlock | .//netex:CompoundTrain | .//netex:Connection | .//netex:ControlCentre | .//netex:ControllableElement | .//netex:Country | .//netex:CoupledJourney | .//netex:CourseOfJourneys | .//netex:CrewBase | .//netex:CrossingEquipment | .//netex:Customer | .//netex:CustomerAccount | .//netex:CustomerAccountStatus | .//netex:CustomerPurchasePackage | .//netex:CustomerPurchasePackageElement | .//netex:CustomerPurchaseParameterAssignment | .//netex:CustomerService | .//netex:CycleStorageEquipment | .//netex:DatedServiceJourney | .//netex:DatedSpecialService | .//netex:DatedVehicleJourney | .//netex:DayType | .//netex:DayTypeAssignment | .//netex:DeadRun | .//netex:DeadRunJourneyPattern | .//netex:DefaultConnection | .//netex:DefaultInterchange | .//netex:DeliveryVariant | .//netex:Department | .//netex:DestinationDisplay | .//netex:DestinationDisplayVariant | .//netex:Direction | .//netex:DiscountingRule | .//netex:DisplayAssignment | .//netex:DistanceMatrixElement | .//netex:DistributionAssignment | .//netex:DistributionChannel | .//netex:DriverScheduleFrame | .//netex:DriverTrip | .//netex:DriverTripTime | .//netex:Duty | .//netex:DutyPart | .//netex:DynamicStopAssignment | .//netex:EligibilityChangePolicy | .//netex:EntitlementGiven | .//netex:EntitlementProduct | .//netex:EntitlementRequired | .//netex:Entrance | .//netex:EntranceEquipment | .//netex:EquipmentPlace | .//netex:EquipmentPosition | .//netex:EscalatorEquipment | .//netex:EstimatedPassingTimeView | .//netex:Exchanging | .//netex:FacilityRequirement | .//netex:FareContract | .//netex:FareContractEntry_ | .//netex:FareDayType | .//netex:FareDemandFactor | .//netex:FareFrame | .//netex:FareInterval | .//netex:FareQuotaFactor | .//netex:FareScheduledStopPoint | .//netex:FareSection | .//netex:FareStructureElement | .//netex:FareStructureFactor | .//netex:FareTable | .//netex:FareTableInContext | .//netex:FareUnit | .//netex:FareZone | .//netex:FlexibleArea | .//netex:FlexibleLine | .//netex:FlexibleQuay | .//netex:FlexibleRoute | .//netex:FlexibleServiceProperties | .//netex:FlexibleStopAssignment | .//netex:FlexibleStopPlace | .//netex:FrequencyOfUse | .//netex:FulfilmentMethod | .//netex:Garage | .//netex:GaragePoint | .//netex:GeneralFrame | .//netex:GeneralGroupOfEntities | .//netex:GeneralOrganisation | .//netex:GeneralSection | .//netex:GeneralSign | .//netex:GeneralZone | .//netex:GenericParameterAssignment | .//netex:GenericParameterAssignmentInContext | .//netex:GeographicalInterval | .//netex:GeographicalStructureFactor | .//netex:GeographicalUnit | .//netex:GroupOfDistanceMatrixElements | .//netex:GroupOfDistributionChannels | .//netex:GroupOfLines | .//netex:GroupOfLinkSequences | .//netex:GroupOfLinks | .//netex:GroupOfOperators | .//netex:GroupOfPlaces | .//netex:GroupOfPoints | .//netex:GroupOfSalesOfferPackages | .//netex:GroupOfServices | .//netex:GroupOfStopPlaces | .//netex:GroupOfTimebands | .//netex:GroupOfTimingLinks | .//netex:GroupTicket | .//netex:HailAndRideArea | .//netex:HeadingSign | .//netex:HeadwayJourneyGroup | .//netex:HelpPointEquipment | .//netex:HireService | .//netex:InfrastructureFrame | .//netex:InterchangeRule | .//netex:Interchanging | .//netex:JourneyAccounting | .//netex:JourneyMeeting | .//netex:JourneyPart | .//netex:JourneyPartCouple | .//netex:JourneyPattern | .//netex:Layer | .//netex:LeftLuggageService | .//netex:Level | .//netex:LiftEquipment | .//netex:LimitingRule | .//netex:LimitingRuleInContext | .//netex:Line | .//netex:LineNetwork | .//netex:LineSection | .//netex:LineShape | .//netex:LinkProjection | .//netex:LinkSequenceProjection | .//netex:LogicalDisplay | .//netex:LostPropertyService | .//netex:LuggageAllowance | .//netex:LuggageService | .//netex:ManagementAgent | .//netex:MeetingPointService | .//netex:MeetingRestriction | .//netex:MinimumStay | .//netex:MoneyService | .//netex:MonthValidityOffset | .//netex:NavigationPath | .//netex:NavigationPathAssignment | .//netex:Network | .//netex:NormalDatedVehicleJourney | .//netex:Notice | .//netex:NoticeAssignment | .//netex:ObservedPassingTimeView | .//netex:OfferedTravelSpecification | .//netex:OpenTransportMode | .//netex:OperatingDay | .//netex:OperatingDepartment | .//netex:OperatingPeriod | .//netex:OperationalContext | .//netex:Operator | .//netex:OrganisationDayType | .//netex:OrganisationPart | .//netex:OrganisationalUnit | .//netex:OtherOrganisation | .//netex:OtherPlaceEquipment | .//netex:OvertakingPossibility | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:ParkingChargeBand | .//netex:ParkingComponent | .//netex:ParkingEntranceForVehicles | .//netex:ParkingPassengerEntrance | .//netex:ParkingPoint | .//netex:ParkingTariff | .//netex:PassengerCapacity | .//netex:PassengerCarryingRequirement | .//netex:PassengerCarryingRequirementsView | .//netex:PassengerInformationEquipment | .//netex:PassengerSafetyEquipment | .//netex:PassengerStopAssignment | .//netex:PassingTimeView | .//netex:PathJunction | .//netex:PathLink | .//netex:PenaltyPolicy | .//netex:PlaceLighting | .//netex:PlaceSign | .//netex:Point | .//netex:PointOfInterest | .//netex:PointOfInterestClassification | .//netex:PointOfInterestClassificationHierarchy | .//netex:PointOfInterestEntrance | .//netex:PointOfInterestSpace | .//netex:PointOfInterestVehicleEntrance | .//netex:PointProjection | .//netex:PostalAddress | .//netex:PreassignedFareProduct | .//netex:PriceGroup | .//netex:PriceUnit | .//netex:PricingParameterSet | .//netex:PricingRule | .//netex:PricingService | .//netex:PurchaseWindow | .//netex:PurposeOfEquipmentProfile | .//netex:PurposeOfGrouping | .//netex:PurposeOfJourneyPartition | .//netex:QualityStructureFactor | .//netex:Quay | .//netex:QueueingEquipment | .//netex:RailwayElement | .//netex:RailwayJunction | .//netex:RampEquipment | .//netex:Refunding | .//netex:ReliefOpportunity | .//netex:ReliefPoint | .//netex:Replacing | .//netex:RequestedTravelSpecification | .//netex:Reselling | .//netex:Reserving | .//netex:ResourceFrame | .//netex:ResponsibilitySet | .//netex:RestrictedManoeuvre | .//netex:RetailConsortium | .//netex:RetailDevice | .//netex:RetailService | .//netex:RhythmicalJourneyGroup | .//netex:RoadAddress | .//netex:RoadElement | .//netex:RoadJunction | .//netex:RoughSurface | .//netex:RoundTrip | .//netex:Rounding | .//netex:Route | .//netex:RouteInstruction | .//netex:RouteLink | .//netex:RoutePoint | .//netex:Routing | .//netex:RoutingConstraintZone | .//netex:RubbishDisposalEquipment | .//netex:SaleDiscountRight | .//netex:SalesNoticeAssignment | .//netex:SalesOfferPackage | .//netex:SalesOfferPackageElement | .//netex:SalesOfferPackageEntitlementGiven | .//netex:SalesOfferPackageEntitlementRequired | .//netex:SalesOfferPackageSubstitution | .//netex:SalesTransaction | .//netex:SalesTransactionFrame | .//netex:SanitaryEquipment | .//netex:ScheduledStopPoint | .//netex:SchematicMap | .//netex:SeatingEquipment | .//netex:SeriesConstraint | .//netex:ServiceAccessRight | .//netex:ServiceAccessRight_ | .//netex:ServiceCalendar | .//netex:ServiceCalendarFrame | .//netex:ServiceExclusion | .//netex:ServiceFacilitySet | .//netex:ServiceFrame | .//netex:ServiceJourney | .//netex:ServiceJourneyInterchange | .//netex:ServiceJourneyPattern | .//netex:ServiceJourneyPatternInterchange | .//netex:ServiceLink | .//netex:ServicePattern | .//netex:ServiceSite | .//netex:ServicedOrganisation | .//netex:ShelterEquipment | .//netex:SignEquipment | .//netex:SimpleAvailabilityCondition | .//netex:SimpleFeature | .//netex:SimpleValidityCondition | .//netex:SiteConnection | .//netex:SiteFacilitySet | .//netex:SiteFrame | .//netex:SitePathLink | .//netex:SpatialFeature | .//netex:SpecialService | .//netex:SpecificParameterAssignment | .//netex:StaircaseEquipment | .//netex:StandardFareTable | .//netex:StepLimit | .//netex:StopArea | .//netex:StopPlace | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:Submode | .//netex:Subscribing | .//netex:SupplementProduct | .//netex:Suspending | .//netex:TargetPassingTimeView | .//netex:Tariff | .//netex:TariffZone | .//netex:TemplateServiceJourney | .//netex:TemplateVehicleJourney | .//netex:ThirdPartyProduct | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment | .//netex:TicketingService | .//netex:TimeDemandProfile | .//netex:TimeDemandType | .//netex:TimeDemandTypeAssignment | .//netex:TimeInterval | .//netex:TimeStructureFactor | .//netex:TimeUnit | .//netex:Timeband | .//netex:TimetableFrame | .//netex:TimetabledPassingTimeView | .//netex:TimingAlgorithmType | .//netex:TimingLink | .//netex:TimingPattern | .//netex:TimingPoint | .//netex:TopographicPlace | .//netex:TopographicProjection | .//netex:TrafficControlPoint | .//netex:Train | .//netex:TrainBlock | .//netex:TrainBlockPart | .//netex:TrainComponent | .//netex:TrainComponentLabelAssignment | .//netex:TrainElement | .//netex:TrainNumber | .//netex:TrainStopAssignment | .//netex:TransferRestriction | .//netex:Transferability | .//netex:TransportAdministrativeZone | .//netex:TravelAgent | .//netex:TravelDocument | .//netex:TravelSpecification | .//netex:TravelSpecification_ | .//netex:TravelatorEquipment | .//netex:TrolleyStandEquipment | .//netex:TypeOfAccessRightAssignment | .//netex:TypeOfActivation | .//netex:TypeOfCodespaceAssignment | .//netex:TypeOfConcession | .//netex:TypeOfCongestion | .//netex:TypeOfCustomerAccount | .//netex:TypeOfDeliveryVariant | .//netex:TypeOfEquipment | .//netex:TypeOfFacility | .//netex:TypeOfFareContract | .//netex:TypeOfFareContractEntry | .//netex:TypeOfFareProduct | .//netex:TypeOfFareStructureElement | .//netex:TypeOfFareStructureFactor | .//netex:TypeOfFareTable | .//netex:TypeOfFeature | .//netex:TypeOfFlexibleService | .//netex:TypeOfFrame | .//netex:TypeOfJourneyPattern | .//netex:TypeOfLine | .//netex:TypeOfLink | .//netex:TypeOfLinkSequence | .//netex:TypeOfMachineReadability | .//netex:TypeOfNotice | .//netex:TypeOfOperation | .//netex:TypeOfOrganisation | .//netex:TypeOfOrganisationPart | .//netex:TypeOfPassengerInformationEquipment | .//netex:TypeOfPaymentMethod | .//netex:TypeOfPlace | .//netex:TypeOfPoint | .//netex:TypeOfPricingRule | .//netex:TypeOfProductCategory | .//netex:TypeOfProjection | .//netex:TypeOfResponsibilityRole | .//netex:TypeOfRetailDevice | .//netex:TypeOfSalesOfferPackage | .//netex:TypeOfSecurityList | .//netex:TypeOfService | .//netex:TypeOfServiceFeature | .//netex:TypeOfTariff | .//netex:TypeOfTimeDemandType | .//netex:TypeOfTransfer | .//netex:TypeOfTravelDocument | .//netex:TypeOfUsageParameter | .//netex:TypeOfValidity | .//netex:TypeOfVersion | .//netex:TypeOfZone | .//netex:UicOperatingPeriod | .//netex:UsageDiscountRight | .//netex:UsageValidityPeriod | .//netex:UserProfile | .//netex:ValidBetween | .//netex:ValidDuring | .//netex:ValidableElement | .//netex:ValidityCondition | .//netex:ValidityParameterAssignment | .//netex:ValidityRuleParameter | .//netex:ValidityTrigger | .//netex:ValueSet | .//netex:Vehicle | .//netex:VehicleChargingEquipment | .//netex:VehicleEquipmentProfile | .//netex:VehicleJourney | .//netex:VehicleJourneyStopAssignment | .//netex:VehicleManoeuvringRequirement | .//netex:VehicleModel | .//netex:VehicleScheduleFrame | .//netex:VehicleService | .//netex:VehicleServicePart | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleType | .//netex:VehicleTypeAtPoint | .//netex:VehicleTypeStopAssignment | .//netex:Version | .//netex:WaitingRoomEquipment | .//netex:WheelchairVehicleEquipment | .//netex:Whitelist | .//netex:WireElement | .//netex:WireJunction | .//netex:Zone | .//netex:ZoneProjection | .//netex:RestrictedFacilitySet"/>
+			<xsd:selector xpath=".//netex:AlternativeName | .//netex:Codespace | .//netex:Access | .//netex:AccessRightParameterAssignment | .//netex:AccessSpace | .//netex:AccessVehicleEquipment | .//netex:AccessZone | .//netex:AccountableElement | .//netex:ActivatedEquipment | .//netex:ActivationAssignment | .//netex:ActivationLink | .//netex:ActivationPoint | .//netex:AddressablePlace | .//netex:AdministrativeZone | .//netex:AllowedLineDirection | .//netex:AmountOfPriceUnitProduct | .//netex:AssistanceBookingService | .//netex:AssistanceService | .//netex:Authority | .//netex:AvailabilityCondition | .//netex:BeaconPoint | .//netex:Blacklist | .//netex:Block | .//netex:BlockPart | .//netex:BoardingPosition | .//netex:BorderPoint | .//netex:Branding | .//netex:Cancelling | .//netex:CappedDiscountRight | .//netex:CappingRule | .//netex:CateringService | .//netex:ChargingMoment | .//netex:ChargingPolicy | .//netex:CheckConstraint | .//netex:CheckConstraintDelay | .//netex:CheckConstraintThroughput | .//netex:ClassOfUse | .//netex:CommercialProfile | .//netex:CommonSection | .//netex:CommunicationService | .//netex:CompanionProfile | .//netex:ComplaintsService | .//netex:ComplexFeature | .//netex:ComplexFeatureProjection | .//netex:CompositeFrame | .//netex:CompoundBlock | .//netex:CompoundTrain | .//netex:Connection | .//netex:ControlCentre | .//netex:ControllableElement | .//netex:Country | .//netex:CoupledJourney | .//netex:CourseOfJourneys | .//netex:CrewBase | .//netex:CrossingEquipment | .//netex:Customer | .//netex:CustomerAccount | .//netex:CustomerAccountStatus | .//netex:CustomerPurchasePackage | .//netex:CustomerPurchasePackageElement | .//netex:CustomerPurchaseParameterAssignment | .//netex:CustomerService | .//netex:CycleStorageEquipment | .//netex:DatedServiceJourney | .//netex:DatedSpecialService | .//netex:DatedVehicleJourney | .//netex:DayType | .//netex:DayTypeAssignment | .//netex:DeadRun | .//netex:DeadRunJourneyPattern | .//netex:DefaultConnection | .//netex:DefaultInterchange | .//netex:DeliveryVariant | .//netex:Department | .//netex:DestinationDisplay | .//netex:DestinationDisplayVariant | .//netex:Direction | .//netex:DiscountingRule | .//netex:DisplayAssignment | .//netex:DistanceMatrixElement | .//netex:DistributionAssignment | .//netex:DistributionChannel | .//netex:DriverScheduleFrame | .//netex:DriverTrip | .//netex:DriverTripTime | .//netex:Duty | .//netex:DutyPart | .//netex:DynamicStopAssignment | .//netex:EligibilityChangePolicy | .//netex:EntitlementGiven | .//netex:EntitlementProduct | .//netex:EntitlementRequired | .//netex:Entrance | .//netex:EntranceEquipment | .//netex:EquipmentPlace | .//netex:EquipmentPosition | .//netex:EscalatorEquipment | .//netex:EstimatedPassingTimeView | .//netex:Exchanging | .//netex:FacilityRequirement | .//netex:FareContract | .//netex:FareDayType | .//netex:FareDemandFactor | .//netex:FareFrame | .//netex:FareInterval | .//netex:FareQuotaFactor | .//netex:FareScheduledStopPoint | .//netex:FareSection | .//netex:FareStructureElement | .//netex:FareStructureFactor | .//netex:FareTable | .//netex:FareTableInContext | .//netex:FareUnit | .//netex:FareZone | .//netex:FlexibleArea | .//netex:FlexibleLine | .//netex:FlexibleQuay | .//netex:FlexibleRoute | .//netex:FlexibleServiceProperties | .//netex:FlexibleStopAssignment | .//netex:FlexibleStopPlace | .//netex:FrequencyOfUse | .//netex:FulfilmentMethod | .//netex:Garage | .//netex:GaragePoint | .//netex:GeneralFrame | .//netex:GeneralGroupOfEntities | .//netex:GeneralOrganisation | .//netex:GeneralSection | .//netex:GeneralSign | .//netex:GeneralZone | .//netex:GenericParameterAssignment | .//netex:GenericParameterAssignmentInContext | .//netex:GeographicalInterval | .//netex:GeographicalStructureFactor | .//netex:GeographicalUnit | .//netex:GroupOfDistanceMatrixElements | .//netex:GroupOfDistributionChannels | .//netex:GroupOfLines | .//netex:GroupOfLinkSequences | .//netex:GroupOfLinks | .//netex:GroupOfOperators | .//netex:GroupOfPlaces | .//netex:GroupOfPoints | .//netex:GroupOfSalesOfferPackages | .//netex:GroupOfServices | .//netex:GroupOfStopPlaces | .//netex:GroupOfTimebands | .//netex:GroupOfTimingLinks | .//netex:GroupTicket | .//netex:HailAndRideArea | .//netex:HeadingSign | .//netex:HeadwayJourneyGroup | .//netex:HelpPointEquipment | .//netex:HireService | .//netex:InfrastructureFrame | .//netex:InterchangeRule | .//netex:Interchanging | .//netex:JourneyAccounting | .//netex:JourneyMeeting | .//netex:JourneyPart | .//netex:JourneyPartCouple | .//netex:JourneyPattern | .//netex:Layer | .//netex:LeftLuggageService | .//netex:Level | .//netex:LiftEquipment | .//netex:LimitingRule | .//netex:LimitingRuleInContext | .//netex:Line | .//netex:LineNetwork | .//netex:LineSection | .//netex:LineShape | .//netex:LinkProjection | .//netex:LinkSequenceProjection | .//netex:LogicalDisplay | .//netex:LostPropertyService | .//netex:LuggageAllowance | .//netex:LuggageService | .//netex:ManagementAgent | .//netex:MeetingPointService | .//netex:MeetingRestriction | .//netex:MinimumStay | .//netex:MoneyService | .//netex:MonthValidityOffset | .//netex:NavigationPath | .//netex:NavigationPathAssignment | .//netex:Network | .//netex:NormalDatedVehicleJourney | .//netex:Notice | .//netex:NoticeAssignment | .//netex:ObservedPassingTimeView | .//netex:OfferedTravelSpecification | .//netex:OpenTransportMode | .//netex:OperatingDay | .//netex:OperatingDepartment | .//netex:OperatingPeriod | .//netex:OperationalContext | .//netex:Operator | .//netex:OrganisationDayType | .//netex:OrganisationPart | .//netex:OrganisationalUnit | .//netex:OtherOrganisation | .//netex:OtherPlaceEquipment | .//netex:OvertakingPossibility | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:ParkingChargeBand | .//netex:ParkingComponent | .//netex:ParkingEntranceForVehicles | .//netex:ParkingPassengerEntrance | .//netex:ParkingPoint | .//netex:ParkingTariff | .//netex:PassengerCapacity | .//netex:PassengerCarryingRequirement | .//netex:PassengerCarryingRequirementsView | .//netex:PassengerInformationEquipment | .//netex:PassengerSafetyEquipment | .//netex:PassengerStopAssignment | .//netex:PassingTimeView | .//netex:PathJunction | .//netex:PathLink | .//netex:PenaltyPolicy | .//netex:PlaceLighting | .//netex:PlaceSign | .//netex:Point | .//netex:PointOfInterest | .//netex:PointOfInterestClassification | .//netex:PointOfInterestClassificationHierarchy | .//netex:PointOfInterestEntrance | .//netex:PointOfInterestSpace | .//netex:PointOfInterestVehicleEntrance | .//netex:PointProjection | .//netex:PostalAddress | .//netex:PreassignedFareProduct | .//netex:PriceGroup | .//netex:PriceUnit | .//netex:PricingParameterSet | .//netex:PricingRule | .//netex:PricingService | .//netex:PurchaseWindow | .//netex:PurposeOfEquipmentProfile | .//netex:PurposeOfGrouping | .//netex:PurposeOfJourneyPartition | .//netex:QualityStructureFactor | .//netex:Quay | .//netex:QueueingEquipment | .//netex:RailwayElement | .//netex:RailwayJunction | .//netex:RampEquipment | .//netex:Refunding | .//netex:ReliefOpportunity | .//netex:ReliefPoint | .//netex:Replacing | .//netex:RequestedTravelSpecification | .//netex:Reselling | .//netex:Reserving | .//netex:ResourceFrame | .//netex:ResponsibilitySet | .//netex:RestrictedManoeuvre | .//netex:RetailConsortium | .//netex:RetailDevice | .//netex:RetailService | .//netex:RhythmicalJourneyGroup | .//netex:RoadAddress | .//netex:RoadElement | .//netex:RoadJunction | .//netex:RoughSurface | .//netex:RoundTrip | .//netex:Rounding | .//netex:Route | .//netex:RouteInstruction | .//netex:RouteLink | .//netex:RoutePoint | .//netex:Routing | .//netex:RoutingConstraintZone | .//netex:RubbishDisposalEquipment | .//netex:SaleDiscountRight | .//netex:SalesNoticeAssignment | .//netex:SalesOfferPackage | .//netex:SalesOfferPackageElement | .//netex:SalesOfferPackageEntitlementGiven | .//netex:SalesOfferPackageEntitlementRequired | .//netex:SalesOfferPackageSubstitution | .//netex:SalesTransaction | .//netex:SalesTransactionFrame | .//netex:SanitaryEquipment | .//netex:ScheduledStopPoint | .//netex:SchematicMap | .//netex:SeatingEquipment | .//netex:SeriesConstraint | .//netex:ServiceAccessRight | .//netex:ServiceCalendar | .//netex:ServiceCalendarFrame | .//netex:ServiceExclusion | .//netex:ServiceFacilitySet | .//netex:ServiceFrame | .//netex:ServiceJourney | .//netex:ServiceJourneyInterchange | .//netex:ServiceJourneyPattern | .//netex:ServiceJourneyPatternInterchange | .//netex:ServiceLink | .//netex:ServicePattern | .//netex:ServiceSite | .//netex:ServicedOrganisation | .//netex:ShelterEquipment | .//netex:SignEquipment | .//netex:SimpleAvailabilityCondition | .//netex:SimpleFeature | .//netex:SimpleValidityCondition | .//netex:SiteConnection | .//netex:SiteFacilitySet | .//netex:SiteFrame | .//netex:SitePathLink | .//netex:SpatialFeature | .//netex:SpecialService | .//netex:SpecificParameterAssignment | .//netex:StaircaseEquipment | .//netex:StandardFareTable | .//netex:StepLimit | .//netex:StopArea | .//netex:StopPlace | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:Submode | .//netex:Subscribing | .//netex:SupplementProduct | .//netex:Suspending | .//netex:TargetPassingTimeView | .//netex:Tariff | .//netex:TariffZone | .//netex:TemplateServiceJourney | .//netex:TemplateVehicleJourney | .//netex:ThirdPartyProduct | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment | .//netex:TicketingService | .//netex:TimeDemandProfile | .//netex:TimeDemandType | .//netex:TimeDemandTypeAssignment | .//netex:TimeInterval | .//netex:TimeStructureFactor | .//netex:TimeUnit | .//netex:Timeband | .//netex:TimetableFrame | .//netex:TimetabledPassingTimeView | .//netex:TimingAlgorithmType | .//netex:TimingLink | .//netex:TimingPattern | .//netex:TimingPoint | .//netex:TopographicPlace | .//netex:TopographicProjection | .//netex:TrafficControlPoint | .//netex:Train | .//netex:TrainBlock | .//netex:TrainBlockPart | .//netex:TrainComponent | .//netex:TrainComponentLabelAssignment | .//netex:TrainElement | .//netex:TrainNumber | .//netex:TrainStopAssignment | .//netex:TransferRestriction | .//netex:Transferability | .//netex:TransportAdministrativeZone | .//netex:TravelAgent | .//netex:TravelDocument | .//netex:TravelSpecification | .//netex:TravelatorEquipment | .//netex:TrolleyStandEquipment | .//netex:TypeOfAccessRightAssignment | .//netex:TypeOfActivation | .//netex:TypeOfCodespaceAssignment | .//netex:TypeOfConcession | .//netex:TypeOfCongestion | .//netex:TypeOfCustomerAccount | .//netex:TypeOfDeliveryVariant | .//netex:TypeOfEquipment | .//netex:TypeOfFacility | .//netex:TypeOfFareContract | .//netex:TypeOfFareContractEntry | .//netex:TypeOfFareProduct | .//netex:TypeOfFareStructureElement | .//netex:TypeOfFareStructureFactor | .//netex:TypeOfFareTable | .//netex:TypeOfFeature | .//netex:TypeOfFlexibleService | .//netex:TypeOfFrame | .//netex:TypeOfJourneyPattern | .//netex:TypeOfLine | .//netex:TypeOfLink | .//netex:TypeOfLinkSequence | .//netex:TypeOfMachineReadability | .//netex:TypeOfNotice | .//netex:TypeOfOperation | .//netex:TypeOfOrganisation | .//netex:TypeOfOrganisationPart | .//netex:TypeOfPassengerInformationEquipment | .//netex:TypeOfPaymentMethod | .//netex:TypeOfPlace | .//netex:TypeOfPoint | .//netex:TypeOfPricingRule | .//netex:TypeOfProductCategory | .//netex:TypeOfProjection | .//netex:TypeOfResponsibilityRole | .//netex:TypeOfRetailDevice | .//netex:TypeOfSalesOfferPackage | .//netex:TypeOfSecurityList | .//netex:TypeOfService | .//netex:TypeOfServiceFeature | .//netex:TypeOfTariff | .//netex:TypeOfTimeDemandType | .//netex:TypeOfTransfer | .//netex:TypeOfTravelDocument | .//netex:TypeOfUsageParameter | .//netex:TypeOfValidity | .//netex:TypeOfVersion | .//netex:TypeOfZone | .//netex:UicOperatingPeriod | .//netex:UsageDiscountRight | .//netex:UsageValidityPeriod | .//netex:UserProfile | .//netex:ValidBetween | .//netex:ValidDuring | .//netex:ValidableElement | .//netex:ValidityCondition | .//netex:ValidityParameterAssignment | .//netex:ValidityRuleParameter | .//netex:ValidityTrigger | .//netex:ValueSet | .//netex:Vehicle | .//netex:VehicleChargingEquipment | .//netex:VehicleEquipmentProfile | .//netex:VehicleJourney | .//netex:VehicleJourneyStopAssignment | .//netex:VehicleManoeuvringRequirement | .//netex:VehicleModel | .//netex:VehicleScheduleFrame | .//netex:VehicleService | .//netex:VehicleServicePart | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleType | .//netex:VehicleTypeAtPoint | .//netex:VehicleTypeStopAssignment | .//netex:Version | .//netex:WaitingRoomEquipment | .//netex:WheelchairVehicleEquipment | .//netex:Whitelist | .//netex:WireElement | .//netex:WireJunction | .//netex:Zone | .//netex:ZoneProjection"/>
 			<xsd:field xpath="@dataSourceRef"/>
 		</xsd:keyref>
 		<xsd:keyref name="DataSource_AnyVersionedKeyRef" refer="netex:DataSource_AnyVersionedKey">
@@ -416,18 +409,18 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [ResponsibilitySet Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ResponsibilitySet | .//netex:DelegatedResponsibilitySet"/>
+			<xsd:selector xpath=".//netex:ResponsibilitySet"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====ResponsibilitySet Key ========================== -->
 		<xsd:keyref name="ResponsibilitySet_AnyKeyRef" refer="netex:ResponsibilitySet_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ResponsibilitySetRef | .//netex:DefaultResponsibilitySetRef | .//netex:DelegatedResponsibilitySetRef"/>
+			<xsd:selector xpath=".//netex:ResponsibilitySetRef | .//netex:DefaultResponsibilitySetRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="ResponsibilitySet_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ResponsibilitySet | .//netex:DefaultResponsibilitySet"/>
+			<xsd:selector xpath=".//netex:ResponsibilitySet"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -462,17 +455,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====Responsibility Key ========================== -->
-		<xsd:keyref name="ResponsibilityRoleAssignment_AnyKeyRef" refer="netex:ResponsibilityRoleAssignment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ResponsibilityRoleAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="ResponsibilityRoleAssignment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ResponsibilityRoleAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====Contract============================== -->
 		<!-- =====Contract unique========================== -->
 		<xsd:unique name="Contract_UniqueBy_Id_Version">
@@ -485,7 +467,7 @@
 		</xsd:unique>
 		<!-- =====Contract Key ========================== -->
 		<xsd:keyref name="Contract_AnyKeyRef" refer="netex:Contract_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ContractRef |.//netex:SupplyContractRef  "/>
+			<xsd:selector xpath=".//netex:ContractRef | .//netex:SupplyContractRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -503,15 +485,6 @@
 			<xsd:selector xpath=".//netex:Entity_Entity"/>
 			<xsd:field xpath="@id"/>
 		</xsd:unique>
-		<!-- =====Entity_Entity Key ========================== -->
-		<xsd:keyref name="Entity_Entity_AnyKeyRef" refer="netex:Entity_Entity_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Entity_EntityRef | .//netex:DefaultEntity_EntityRef"/>
-			<xsd:field xpath="@ref"/>
-		</xsd:keyref>
-		<xsd:key name="Entity_Entity_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Entity_Entity"/>
-			<xsd:field xpath="@id"/>
-		</xsd:key>
 		<!-- =====Version============================== -->
 		<!-- =====Version unique========================== -->
 		<!-- DEPRECATED -v2.0 -->
@@ -609,18 +582,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====ValueSet============================== -->
-		<xsd:keyref name="ValueSet_AnyKeyRef" refer="netex:ValueSet_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ValueSetRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<!-- =====ValueSet Key ========================== -->
-		<xsd:key name="ValueSet_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ValueSet"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====PricingParameterSet unique========================== -->
 		<xsd:unique name="PricingParameterSet_UniqueBy_Id_Version">
 			<xsd:annotation>
@@ -1068,7 +1029,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [PointOnLink Id + PointOnLink] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PointOnLink | .//netex:StartPointOnLink | .//netex:EndPointOnLink"/>
+			<xsd:selector xpath=".//netex:PointOnLink"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -1147,17 +1108,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====PointOnSection Key ========================== -->
-		<xsd:keyref name="PointOnSection_KeyRef" refer="netex:PointOnSection_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:PointOnSectionRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="PointOnSection_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:PointOnSection"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====LinkOnSection============================== -->
 		<!-- =====LinkOnSection unique========================== -->
 		<xsd:unique name="LinkOnSection_UniqueBy_Id_Version_Order">
@@ -1168,17 +1118,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====LinkOnSection Key ========================== -->
-		<xsd:keyref name="LinkOnSection_KeyRef" refer="netex:LinkOnSection_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:LinkOnSectionRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="LinkOnSection_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:LinkOnSection"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====SectionInSequence ============================== -->
 		<!-- =====SectionInSequence unique========================== -->
 		<xsd:unique name="SectionInSequence_UniqueBy_Id_Version_Order">
@@ -1189,17 +1128,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====SectionInSequence Key ========================== -->
-		<xsd:keyref name="SectionInSequence_KeyRef" refer="netex:SectionInSequence_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:SectionInSequenceRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="SectionInSequence_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:SectionInSequence"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====Zone============================== -->
 		<xsd:keyref name="Zone_AnyKeyRef" refer="netex:Zone_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:ZoneRef | .//netex:ParentZoneRef | .//netex:ProjectedZoneRef | .//netex:ProjectToZoneRef | .//netex:ProjectedObjectRef"/>
@@ -1207,7 +1135,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Zone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:ConnectionZone | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace | .//netex:Garage | .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay | .//netex:StopPlaceEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:TaxiRank | .//netex:TaxiStand | .//netex:TransportAdministrativeZone | .//netex:AdministrativeZone | .//netex:GeneralZone"/>
+			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace | .//netex:Garage | .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay | .//netex:StopPlaceEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:TaxiRank | .//netex:TaxiStand | .//netex:TransportAdministrativeZone | .//netex:AdministrativeZone | .//netex:GeneralZone"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1223,7 +1151,7 @@
 		</xsd:unique>
 		<!-- =====TariffZone Key ========================== -->
 		<xsd:keyref name="TariffZone_AnyKeyRef" refer="netex:TariffZone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TariffZoneRef | .//netex:ParentTariffZoneRef | .//netex:StartTariffZoneRef | .//netex:EndTariffZoneRef | .//netex:FareZoneRef | .//netex:ProjectedObjectRef"/>
+			<xsd:selector xpath=".//netex:TariffZoneRef | .//netex:StartTariffZoneRef | .//netex:EndTariffZoneRef | .//netex:FareZoneRef | .//netex:ProjectedObjectRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1570,17 +1498,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====RelatedOrganisation Key ========================== -->
-		<xsd:keyref name="RelatedOrganisation_KeyRef" refer="netex:RelatedOrganisation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RelatedOrganisationRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="RelatedOrganisation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RelatedOrganisation"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====Address Constraints========================= -->
 		<!-- =====Address============================== -->
 		<xsd:keyref name="Address_AnyKeyRef" refer="netex:Address_AnyVersionedKey">
@@ -1688,17 +1605,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====ScheduledOperation Key ========================== -->
-		<xsd:keyref name="ScheduledOperation_KeyRef" refer="netex:ScheduledOperation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ScheduledOperationRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="ScheduledOperation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ScheduledOperation"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====FlexibleOperation============================== -->
 		<!-- =====FlexibleOperation unique========================== -->
 		<xsd:unique name="FlexibleOperation_UniqueBy_Id_Version">
@@ -1709,17 +1615,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====FlexibleOperation Key ========================== -->
-		<xsd:keyref name="FlexibleOperation_KeyRef" refer="netex:FlexibleOperation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FlexibleOperationRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="FlexibleOperation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FlexibleOperation"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====VehicleRental============================== -->
 		<!-- =====VehicleRental unique========================== -->
 		<xsd:unique name="VehicleRental_UniqueBy_Id_Version">
@@ -1817,7 +1712,7 @@
 		</xsd:unique>
 		<!-- =====Operator Key ========================== -->
 		<xsd:keyref name="Operator_KeyRef" refer="netex:Operator_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:OperatorRef | .//netex:ParentOperatorRef | .//netex:ServiceFacilitySet/netex:ProvidedByRef"/>
+			<xsd:selector xpath=".//netex:OperatorRef | .//netex:ServiceFacilitySet/netex:ProvidedByRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1838,7 +1733,7 @@
 		</xsd:unique>
 		<!-- =====Authority Key ========================== -->
 		<xsd:keyref name="Authority_KeyRef" refer="netex:Authority_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:AuthorityRef | .//netex:ParentAuthorityRef"/>
+			<xsd:selector xpath=".//netex:AuthorityRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1985,7 +1880,7 @@
 		</xsd:unique>
 		<!-- =====GeneralOrganisation Key ========================== -->
 		<xsd:keyref name="GeneralOrganisation_KeyRef" refer="netex:GeneralOrganisation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralOrganisationRef | .//netex:ParentGeneralOrganisationRef"/>
+			<xsd:selector xpath=".//netex:GeneralOrganisationRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -2006,7 +1901,7 @@
 		</xsd:unique>
 		<!-- =====ServicedOrganisation Key ========================== -->
 		<xsd:keyref name="ServicedOrganisation_KeyRef" refer="netex:ServicedOrganisation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServicedOrganisationRef | .//netex:ParentServicedOrganisationRef"/>
+			<xsd:selector xpath=".//netex:ServicedOrganisationRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -2017,7 +1912,7 @@
 		</xsd:key>
 		<!-- =====ManagementAgent Key ========================== -->
 		<xsd:keyref name="ManagementAgent_KeyRef" refer="netex:ManagementAgent_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ManagementAgentRef | .//netex:ParentManagementAgentRef"/>
+			<xsd:selector xpath=".//netex:ManagementAgentRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -2028,7 +1923,7 @@
 		</xsd:key>
 		<!-- =====TravelAgent Key ========================== -->
 		<xsd:keyref name="TravelAgent_KeyRef" refer="netex:TravelAgent_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TravelAgentRef | .//netex:ParentTravelAgentRef"/>
+			<xsd:selector xpath=".//netex:TravelAgentRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -2037,27 +1932,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====TypeOfFarePaymentMethod============================== -->
-		<!-- =====TypeOfFarePaymentMethod unique========================== -->
-		<xsd:unique name="TypeOfFarePaymentMethod_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [TypeOfFarePaymentMethod Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:TypeOfFarePaymentMethod"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====TypeOfFarePaymentMethod Key ========================== -->
-		<xsd:keyref name="TypeOfFarePaymentMethod_KeyRef" refer="netex:TypeOfFarePaymentMethod_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TypeOfFarePaymentMethodRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="TypeOfFarePaymentMethod_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TypeOfFarePaymentMethod"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====Blacklist============================== -->
 		<!-- =====Blacklist unique========================== -->
 		<xsd:unique name="Blacklist_UniqueBy_Id_Version">
@@ -2331,27 +2205,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====QueuingEquipment============================== -->
-		<!-- =====QueuingEquipment unique========================== -->
-		<xsd:unique name="QueuingEquipment_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [QueuingEquipment Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:QueuingEquipment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====QueuingEquipment Key ========================== -->
-		<xsd:keyref name="QueuingEquipment_AnyKeyRef" refer="netex:QueuingEquipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:QueuingEquipmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="QueuingEquipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:QueuingEquipment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====CrossingEquipment============================== -->
 		<!-- =====CrossingEquipment unique========================== -->
 		<xsd:unique name="CrossingEquipment_UniqueBy_Id_Version">
@@ -2383,17 +2236,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====PlaceLighting Key ========================== -->
-		<xsd:keyref name="PlaceLighting_AnyKeyRef" refer="netex:PlaceLighting_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PlaceLightingRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="PlaceLighting_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PlaceLighting"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====RoughSurface============================== -->
 		<!-- =====RoughSurface unique========================== -->
 		<xsd:unique name="RoughSurface_UniqueBy_Id_Version">
@@ -3725,27 +3567,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====TypeOfRollingStockItem============================ -->
-		<!-- =====TypeOfRollingStockItem unique========================== -->
-		<xsd:unique name="TypeOfRollingStockItem_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [TypeOfRollingStockItem Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:TypeOfRollingStockItem"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====TypeOfRollingStockItem Key ========================== -->
-		<xsd:keyref name="TypeOfRollingStockItem_KeyRef" refer="netex:TypeOfRollingStockItem_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TypeOfRollingStockItemRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="TypeOfRollingStockItem_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TypeOfRollingStockItem"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====PassengerCarryingRequirement== ========================== -->
 		<!-- =====PassengerCarryingRequirement unique========================== -->
 		<xsd:unique name="PassengerCarryingRequirement_UniqueBy_Id_Version">
@@ -4085,12 +3906,12 @@
 		<!-- =====DeckEntrance============================ -->
 		<!-- =====DeckEntrance Key ========================== -->
 		<xsd:keyref name="DeckEntrance_KeyRef" refer="netex:DeckEntrance_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FromDeckEntranceRef|.//netex:ToDeckEntranceRef "/>
+			<xsd:selector xpath=".//netex:FromDeckEntranceRef | .//netex:ToDeckEntranceRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="DeckEntrance_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PassengerEntrance| .//netex:DeckVehicleEntrance | .//netex:OtherDeckEntrance"/>
+			<xsd:selector xpath=".//netex:PassengerEntrance | .//netex:DeckVehicleEntrance | .//netex:OtherDeckEntrance"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4100,7 +3921,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [PassengerEntrance Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PassengerEntrance | .//netex:FromDeckEntrance | .//netex:ToDeckEntrance"/>
+			<xsd:selector xpath=".//netex:PassengerEntrance"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -4148,7 +3969,7 @@
 		</xsd:unique>
 		<!-- =====DeckVehicleEntrance Key ========================== -->
 		<xsd:keyref name="DeckVehicleEntrance_KeyRef" refer="netex:DeckVehicleEntrance_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DeckVehicleEntranceRef "/>
+			<xsd:selector xpath=".//netex:DeckVehicleEntranceRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -4220,27 +4041,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====DeckCapacity============================ -->
-		<!-- =====DeckCapacity unique========================== -->
-		<xsd:unique name="DeckCapacity_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [DeckCapacity Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:DeckCapacity"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====DeckCapacity Key ========================== -->
-		<xsd:keyref name="DeckCapacity_KeyRef" refer="netex:DeckCapacity_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DeckCapacityRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="DeckCapacity_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DeckCapacity"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====TypeOfDeckSpace============================ -->
 		<!-- =====TypeOfDeckSpace unique========================== -->
 		<xsd:unique name="TypeOfDeckSpace_UniqueBy_Id_Version">
@@ -4314,17 +4114,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====DeckEntranceAssignment Key ========================== -->
-		<xsd:keyref name="DeckEntranceAssignment_KeyRef" refer="netex:DeckEntranceAssignment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DeckEntranceAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="DeckEntranceAssignment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DeckEntranceAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====SeatEquipment============================ -->
 		<!-- =====SeatEquipment unique========================== -->
 		<xsd:unique name="SeatEquipment_UniqueBy_Id_Version">
@@ -4526,12 +4315,12 @@
 		</xsd:unique>
 		<!-- =====DEckNavigationPath Key ========================== -->
 		<xsd:keyref name="DeckNavigationPath_KeyRef" refer="netex:DeckNavigationPath_AnyVersionedKey">
-			<xsd:selector xpath=" .//netex:DeckNavigationPathRef"/>
+			<xsd:selector xpath=".//netex:DeckNavigationPathRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="DeckNavigationPath_AnyVersionedKey">
-			<xsd:selector xpath=" .//netex:DeckNavigationPath"/>
+			<xsd:selector xpath=".//netex:DeckNavigationPath"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4751,7 +4540,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [Train Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:Train | .//netex:PoweredTrain | .//netex:UnpoweredTrain "/>
+			<xsd:selector xpath=".//netex:Train | .//netex:PoweredTrain | .//netex:UnpoweredTrain"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -4793,18 +4582,18 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [TrainElementType Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath="  .//netex:TractiveElementType|  .//netex:TrailingElementType| .//netex:TrainElement"/>
+			<xsd:selector xpath=".//netex:TractiveElementType | .//netex:TrailingElementType | .//netex:TrainElement"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====TrainElementType Key ========================== -->
 		<xsd:keyref name="TrainElementType_KeyRef" refer="netex:TrainElementType_AnyVersionedKey">
-			<xsd:selector xpath="  .//netex:TractiveElementTypeRef |  .//netex:TrailingElementTypeRef| .//netex:TrainElementRef"/>
+			<xsd:selector xpath=".//netex:TractiveElementTypeRef | .//netex:TrailingElementTypeRef | .//netex:TrainElementRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="TrainElementType_AnyVersionedKey">
-			<xsd:selector xpath=" .//netex:TractiveElementType|  .//netex:TrailingElementType| .//netex:TrainElement"/>
+			<xsd:selector xpath=".//netex:TractiveElementType | .//netex:TrailingElementType | .//netex:TrainElement"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4897,12 +4686,12 @@
 		<!-- =====Access Target PLACE Reference============================ -->
 		<!-- =====Access Target PLACE Reference== Key ========================== -->
 		<xsd:keyref name="Access_Place_KeyRef" refer="netex:AccessTarget_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Access/netex:From/netex:PlaceRef | .//netex:Access/netex:To/netex:PlaceRef "/>
+			<xsd:selector xpath=".//netex:Access/netex:From/netex:PlaceRef | .//netex:Access/netex:To/netex:PlaceRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="AccessTarget_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:StopPlace |.//netex:PointOfInterest  |.//netex:Parking  |.//netex:Quay  |.//netex:StopPlaceEntrance"/>
+			<xsd:selector xpath=".//netex:StopPlace | .//netex:PointOfInterest | .//netex:Parking | .//netex:Quay | .//netex:StopPlaceEntrance"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -5132,7 +4921,7 @@
 		</xsd:unique>
 		<!-- =====StopPlaceEntrance Key ========================== -->
 		<xsd:keyref name="StopPlaceEntrance_KeyRef" refer="netex:StopPlaceEntrance_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:StopPlaceEntranceRef | .//netex:ParentStopPlaceEntranceRef"/>
+			<xsd:selector xpath=".//netex:StopPlaceEntranceRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -5237,7 +5026,7 @@
 		</xsd:unique>
 		<!-- =====TaxiStand Key ========================== -->
 		<xsd:keyref name="TaxiStand_KeyRef" refer="netex:TaxiStand_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TaxiStandRef | .//netex:ParentTaxiStandRef"/>
+			<xsd:selector xpath=".//netex:TaxiStandRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -5340,17 +5129,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====FlexibleRoute Key ========================== -->
-		<xsd:keyref name="FlexibleRoute_KeyRef" refer="netex:FlexibleRoute_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FlexibleRouteRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="FlexibleRoute_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FlexibleRoute"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====FlexibleQuay============================== -->
 		<!-- =====FlexibleQuay unique========================== -->
 		<xsd:unique name="FlexibleQuay_UniqueBy_Id_Version">
@@ -5489,7 +5267,7 @@
 		</xsd:unique>
 		<!-- =====PointOfInterestEntrance Key ========================== -->
 		<xsd:keyref name="PointOfInterestEntrance_KeyRef" refer="netex:PointOfInterestEntrance_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointOfInterestEntranceRef | .//netex:ParentPointOfInterestEntranceRef"/>
+			<xsd:selector xpath=".//netex:PointOfInterestEntranceRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -5529,17 +5307,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====PointOfInterestClassificationHierarchy Key ========================== -->
-		<xsd:keyref name="PointOfInterestClassificationHierarchy_KeyRef" refer="netex:PointOfInterestClassificationHierarchy_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointOfInterestClassificationHierarchyRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="PointOfInterestClassificationHierarchy_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointOfInterestClassificationHierarchy"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====Parking============================== -->
 		<!-- =====Parking unique========================== -->
 		<xsd:unique name="Parking_UniqueBy_Id_Version">
@@ -5708,27 +5475,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====ParkingAreaCapacityAssignment=========================== -->
-		<!-- =====ParkingAreaCapacityAssignment unique========================== -->
-		<xsd:unique name="ParkingAreaCapacityAssignment_UniqueBy_Id_Version_Order">
-			<xsd:annotation>
-				<xsd:documentation>Every [ParkingAreaCapacityAssignment Id + Version + order] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ParkingAreaCapacityAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====ParkingAreaCapacityAssignment Key ========================== -->
-		<xsd:keyref name="ParkingAreaCapacityAssignment_KeyRef" refer="netex:ParkingAreaCapacityAssignment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ParkingAreaCapacityAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="ParkingAreaCapacityAssignment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ParkingAreaCapacityAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====RentalAvailability============================== -->
 		<!-- =====RentalAvailability unique========================== -->
 		<xsd:unique name="RentalAvailability_UniqueBy_Id_Version">
@@ -6092,12 +5838,12 @@
 		<!-- ===== PathLink Target PLACE Reference============================ -->
 		<!-- =====PathLink PTarget LACE Reference== Key ========================== -->
 		<xsd:keyref name="PathLink_Place_KeyRef" refer="netex:PathLinkTarget_AnyVersionedKey">
-			<xsd:selector xpath=" .//netex:SitePathLink/netex:To/netex:PlaceRef  | .//netex:PathLink/netex:To/netex:PlaceRef | .//netex:SitePathLink/netex:From/netex:PlaceRef | .//netex:PathLink/netex:From/netex:PlaceRef "/>
+			<xsd:selector xpath=".//netex:SitePathLink/netex:To/netex:PlaceRef | .//netex:PathLink/netex:To/netex:PlaceRef | .//netex:SitePathLink/netex:From/netex:PlaceRef | .//netex:PathLink/netex:From/netex:PlaceRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="PathLinkTarget_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:StopPlace |  .//netex:AccessSpace | .//netex:Quay |  .//netex:BoardingPosition  |.//netex:StopPlaceEntrance |.//netex:StopPlaceVehicleEntrance |.//netex:SitePathJunction |.//netex:PathJunction |.//netex:PointOfInterest |.//netex:PointOfInterestSpace  |.//netex:PointOfInterestEntrance   |.//netex:Parking |.//netex:ParkingPassengerEntrance   |.//netex:ParkingEntranceForVehicles  |.//netex:ParkingArea |.//netex:EquipmentPlace"/>
+			<xsd:selector xpath=".//netex:StopPlace | .//netex:AccessSpace | .//netex:Quay | .//netex:BoardingPosition | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:SitePathJunction | .//netex:PathJunction | .//netex:PointOfInterest | .//netex:PointOfInterestSpace | .//netex:PointOfInterestEntrance | .//netex:Parking | .//netex:ParkingPassengerEntrance | .//netex:ParkingEntranceForVehicles | .//netex:ParkingArea | .//netex:EquipmentPlace"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -6107,7 +5853,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [PathJunction Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PathJunction | .//netex:SitePathJunction "/>
+			<xsd:selector xpath=".//netex:PathJunction | .//netex:SitePathJunction"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -6118,7 +5864,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="PathJunction_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PathJunction| .//netex:SitePathJunction"/>
+			<xsd:selector xpath=".//netex:PathJunction | .//netex:SitePathJunction"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -6134,7 +5880,7 @@
 		</xsd:unique>
 		<!-- =====PathInstruction Key ========================== -->
 		<xsd:keyref name="PathInstruction_KeyRef" refer="netex:PathInstruction_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PathInstructionRef "/>
+			<xsd:selector xpath=".//netex:PathInstructionRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -6174,17 +5920,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====NavigationPathAssignment Key ========================== -->
-		<xsd:keyref name="NavigationPathAssignment_KeyRef" refer="netex:NavigationPathAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:NavigationPathAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="NavigationPathAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:NavigationPathAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====PathLinkInSequence============================== -->
 		<!-- =====PathLinkInSequence unique========================== -->
 		<xsd:unique name="PathLinkInSequence_UniqueBy_Id_Version_Order">
@@ -6237,17 +5972,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====AccessSummary Key ========================== -->
-		<xsd:keyref name="AccessSummary_KeyRef" refer="netex:AccessSummary_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:AccessSummaryRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="AccessSummary_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:AccessSummary"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====NETWORK INFRASTRUCTURE======================= -->
 		<!-- =====RoadJunction============================== -->
 		<!-- =====RoadJunction unique========================== -->
@@ -6280,17 +6004,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====RoadElement Key ========================== -->
-		<xsd:keyref name="RoadElement_KeyRef" refer="netex:RoadElement_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RoadElementRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="RoadElement_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RoadElement"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====RailwayJunction============================== -->
 		<!-- =====RailwayJunction unique========================== -->
 		<xsd:unique name="RailwayJunction_UniqueBy_Id_Version">
@@ -6322,17 +6035,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====RailwayElement Key ========================== -->
-		<xsd:keyref name="RailwayElement_KeyRef" refer="netex:RailwayElement_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RailwayElementRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="RailwayElement_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RailwayElement"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====WireJunction============================== -->
 		<!-- =====WireJunction unique========================== -->
 		<xsd:unique name="WireJunction_UniqueBy_Id_Version">
@@ -6364,17 +6066,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====WireElement Key ========================== -->
-		<xsd:keyref name="WireElement_KeyRef" refer="netex:WireElement_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:WireElementRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="WireElement_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:WireElement"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====InfrastructurePoint============================== -->
 		<!-- =====InfrastructurePoint Key ========================== -->
 		<xsd:keyref name="InfrastructurePoint_KeyRef" refer="netex:InfrastructurePoint_AnyVersionedKey">
@@ -6395,7 +6086,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="InfrastructureLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RoadElement | .//netex:RailwayElement | .//netex:Element"/>
+			<xsd:selector xpath=".//netex:RoadElement | .//netex:RailwayElement"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -6496,7 +6187,7 @@
 		</xsd:unique>
 		<!-- =====ActivationPoint Key ========================== -->
 		<xsd:keyref name="ActivationPoint_KeyRef" refer="netex:ActivationPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ActivationPointRef | .//netex:ActivationLink/netex:FromPoint | .//netex:ActivationLink/netex:ToPoint"/>
+			<xsd:selector xpath=".//netex:ActivationPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -6735,7 +6426,7 @@
 		</xsd:unique>
 		<!-- =====Direction Key ========================== -->
 		<xsd:keyref name="Direction_KeyRef" refer="netex:Direction_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DirectionRef | .//netex:ReverseDirectionRef"/>
+			<xsd:selector xpath=".//netex:DirectionRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -7033,17 +6724,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====NoticeAssignment Key ========================== -->
-		<xsd:keyref name="NoticeAssignment_KeyRef" refer="netex:NoticeAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:NoticeAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="NoticeAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:NoticeAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====OccupancyView Key ========================== -->
 		<xsd:keyref name="OccupancyView_KeyRef" refer="netex:OccupancyView_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:OccupancyViewRef"/>
@@ -7065,17 +6745,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====SalesNoticeAssignment Key ========================== -->
-		<xsd:keyref name="SalesNoticeAssignment_KeyRef" refer="netex:SalesNoticeAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:SalesNoticeAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="SalesNoticeAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:SalesNoticeAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====LineNetwork============================== -->
 		<!-- =====LineNetwork unique========================== -->
 		<xsd:unique name="LineNetwork_UniqueBy_Id_Version">
@@ -7188,27 +6857,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====PointInTimingPatternLink============================== -->
-		<!-- =====PointInTimingPattern unique========================== -->
-		<xsd:unique name="PointInTimingPattern_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [PointInTimingPattern Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PointInTimingPattern"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====PointInTimingPattern Key ========================== -->
-		<xsd:keyref name="PointInTimingPattern_KeyRef" refer="netex:PointInTimingPatternChild_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointInTimingPatternRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="PointInTimingPatternChild_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointInTimingPattern"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====SERVICE PATTERN Constraints========================= -->
 		<!-- =====ScheduledStopPoint =================== -->
 		<!-- =====ScheduledStopPoint unique========================== -->
@@ -7222,7 +6870,7 @@
 		</xsd:unique>
 		<!-- =====ScheduledStopPoint Key ========================== -->
 		<xsd:keyref name="ScheduledStopPoint_KeyRef" refer="netex:ScheduledStopPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ScheduledStopPointRef | .//netex:ServiceLink/netex:FromPointRef | .//netex:ServiceLink/netex:ToPointRef | .//netex:FromStopPointRef | .//netex:ToStopPointRef | .//netex:NextStopPointRef | .//netex:AtStopPointRef | .//netex:StartStopPointRef | .//netex:EndStopPointRef | .//netex:FareScheduledStopPointRef | .//netex:AccountingStopPointRef | .//netex:AdjacentStopPointRef"/>
+			<xsd:selector xpath=".//netex:ScheduledStopPointRef | .//netex:ServiceLink/netex:FromPointRef | .//netex:ServiceLink/netex:ToPointRef | .//netex:FromStopPointRef | .//netex:ToStopPointRef | .//netex:AtStopPointRef | .//netex:StartStopPointRef | .//netex:EndStopPointRef | .//netex:FareScheduledStopPointRef | .//netex:AccountingStopPointRef | .//netex:AdjacentStopPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -7279,18 +6927,18 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [VehicleMeetingPoint Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:VehicleMeetingPoint | .//netex:FareVehicleMeetingPoint"/>
+			<xsd:selector xpath=".//netex:VehicleMeetingPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====VehicleMeetingPoint Key ========================== -->
 		<xsd:keyref name="VehicleMeetingPoint_KeyRef" refer="netex:VehicleMeetingPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:VehicleMeetingPointRef | .//netex:VehicleMeetingLink/netex:FromPointRef | .//netex:VehicleMeetingLink/netex:ToPointRef | .//netex:FromVehicleMeetingPointRef | .//netex:ToVehicleMeetingPointRef | .//netex:StartVehicleMeetingPointRef | .//netex:EndVehicleMeetingPointRef"/>
+			<xsd:selector xpath=".//netex:VehicleMeetingPointRef | .//netex:VehicleMeetingLink/netex:FromPointRef | .//netex:VehicleMeetingLink/netex:ToPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="VehicleMeetingPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:VehicleMeetingPoint | .//netex:FareVehicleMeetingPoint"/>
+			<xsd:selector xpath=".//netex:VehicleMeetingPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -7420,27 +7068,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====VehicleTypeZoneRestrictionZone============================== -->
-		<!-- =====VehicleTypeZoneRestrictionZone unique========================== -->
-		<xsd:unique name="VehicleTypeZoneRestrictionZone_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [VehicleTypeZoneRestrictionZone Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:VehicleTypeZoneRestrictionZone"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====VehicleTypeZoneRestrictionZone Key ========================== -->
-		<xsd:keyref name="VehicleTypeZoneRestrictionZone_KeyRef" refer="netex:VehicleTypeZoneRestrictionZone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:VehicleTypeZoneRestrictionZoneRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="VehicleTypeZoneRestrictionZone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:VehicleTypeZoneRestrictionZone"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====PoolOfVehicles============================== -->
 		<!-- =====PoolOfVehicles unique========================== -->
 		<xsd:unique name="PoolOfVehicles_UniqueBy_Id_Version">
@@ -7536,17 +7163,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====FlexibleStopAssignment Key ========================== -->
-		<xsd:keyref name="FlexibleStopAssignment_KeyRef" refer="netex:FlexibleStopAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FlexibleStopAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="FlexibleStopAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FlexibleStopAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====PassengerStopAssignment============================== -->
 		<!-- =====PassengerStopAssignment unique========================== -->
 		<xsd:unique name="PassengerStopAssignment_UniqueBy_Id_Version_Order">
@@ -7830,17 +7446,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====ServiceLinkInJourneyPattern Key ========================== -->
-		<xsd:keyref name="ServiceLinkInJourneyPattern_KeyRef" refer="netex:ServiceLinkInJourneyPattern_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:ServiceLinkInJourneyPatternRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="ServiceLinkInJourneyPattern_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:ServiceLinkInJourneyPattern"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====TimingLinkInJourneyPattern  ========================== -->
 		<!-- =====TimingLinkInJourneyPattern unique========================== -->
 		<xsd:unique name="TimingLinkInJourneyPattern_UniqueBy_Id_Version_Order">
@@ -7979,12 +7584,12 @@
 		</xsd:unique>
 		<!-- =====TimetabledPassingTime Key ========================== -->
 		<xsd:keyref name="TimetabledPassingTime_KeyRef" refer="netex:TimetabledPassingTime_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TimetabledPassingTimeRef | .//netex:PassengerAtStopTimeRef | .//netex:DatedPassingTimeRef | .//netex:TargetPassingTimeRef | .//netex:EstimatedPassingTimeRef | .//netex:ObservedPassingTimeRef"/>
+			<xsd:selector xpath=".//netex:TimetabledPassingTimeRef | .//netex:PassengerAtStopTimeRef | .//netex:TargetPassingTimeRef | .//netex:EstimatedPassingTimeRef | .//netex:ObservedPassingTimeRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="TimetabledPassingTime_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TimetabledPassingTime | .//netex:PassengerAtStopTime | .//netex:DatedPassingTime| .//netex:TargetPassingTime | .//netex:EstimatedPassingTime | .//netex:ObservedPassingTime"/>
+			<xsd:selector xpath=".//netex:TimetabledPassingTime | .//netex:PassengerAtStopTime | .//netex:DatedPassingTime | .//netex:TargetPassingTime | .//netex:EstimatedPassingTime | .//netex:ObservedPassingTime"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -8061,17 +7666,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====JourneyRunTime Key ========================== -->
-		<xsd:keyref name="JourneyRunTime_KeyRef" refer="netex:JourneyRunTime_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:JourneyRunTimeRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="JourneyRunTime_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:JourneyRunTime"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====PassengerInformationEquipment============================== -->
 		<!-- =====PassengerInformationEquipment unique========================== -->
 		<xsd:unique name="PassengerInformationEquipment_UniqueBy_Id_Version">
@@ -8217,12 +7811,12 @@
 		</xsd:unique>
 		<!-- =====Journey Key ========================== -->
 		<xsd:keyref name="Journey_KeyRef" refer="netex:Journey_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef |  .//netex:DatedVehicleJourneyRef |  .//netex:NormalDatedVehicleJourneyRef  |.//netex:TemplateServiceJourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
+			<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:DatedVehicleJourneyRef | .//netex:NormalDatedVehicleJourneyRef | .//netex:TemplateServiceJourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Journey_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney |   .//netex:DatedServiceJourney |   .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney"/>
+			<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -8259,7 +7853,7 @@
 		</xsd:unique>
 		<!-- =====VehicleMeetingPointInPath Key ========================== -->
 		<xsd:keyref name="VehicleMeetingPointInPath_KeyRef" refer="netex:VehicleMeetingPointInPath_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:VehicleMeetingPointInPathRef | .//netex:PointInSingleJourneyPathRef"/>
+			<xsd:selector xpath=".//netex:PointInSingleJourneyPathRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -8446,27 +8040,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====GroupOfServicesMember Key ========================== -->
-		<xsd:keyref name="GroupOfServicesMember_KeyRef" refer="netex:GroupOfServicesMember_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:GroupOfServicesMemberRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="GroupOfServicesMember_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:GroupOfServicesMember"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
-		<!-- =====JourneyFrequencyGroup============================== -->
-		<!-- =====JourneyFrequencyGroup unique========================== -->
-		<xsd:unique name="JourneyFrequencyGroup_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [JourneyFrequencyGroup Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:JourneyFrequencyGroup"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
 		<!-- =====JourneyFrequencyGroup Key ========================== -->
 		<xsd:keyref name="JourneyFrequencyGroup_KeyRef" refer="netex:JourneyFrequencyGroup_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:JourneyFrequencyGroupRef"/>
@@ -8551,17 +8124,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====JourneyPartPosition Key ========================== -->
-		<xsd:keyref name="JourneyPartPosition_KeyRef" refer="netex:JourneyPartPosition_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:JourneyPartPositionRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="JourneyPartPosition_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:JourneyPartPosition"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====CoupledJourney ============================== -->
 		<!-- =====CoupledJourney unique========================== -->
 		<xsd:unique name="CoupledJourney_UniqueBy_Id_Version">
@@ -8595,7 +8157,7 @@
 		</xsd:unique>
 		<!-- =====JourneyPartCouple Key ========================== -->
 		<xsd:keyref name="JourneyPartCouple_KeyRef" refer="netex:JourneyPartCouple_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:JourneyPartCoupleRef | .//netex:JourneyPart/MainPartRef"/>
+			<xsd:selector xpath=".//netex:JourneyPartCoupleRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -9064,27 +8626,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====AccountableElementPart ============================== -->
-		<!-- =====AccountableElementPart unique========================== -->
-		<xsd:unique name="AccountableElementPart_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [AccountableElementPart Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:AccountableElementPart"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====AccountableElementPart Key ========================== -->
-		<xsd:keyref name="AccountableElementPart_KeyRef" refer="netex:AccountableElementPart_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:AccountableElementPartRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="AccountableElementPart_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:AccountableElementPart"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====AccountableElement ============================== -->
 		<!-- =====AccountableElement unique========================== -->
 		<xsd:unique name="AccountableElement_UniqueBy_Id_Version">
@@ -9228,7 +8769,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="RechargingPlan_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RechargingPlan "/>
+			<xsd:selector xpath=".//netex:RechargingPlan"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -9249,7 +8790,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="RechargingStep_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:RechargingStep "/>
+			<xsd:selector xpath=".//netex:RechargingStep"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -9539,27 +9080,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====FareStructure============================== -->
-		<!-- =====FareStructure unique========================== -->
-		<xsd:unique name="FareStructure_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [FareStructure Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:FareStructure"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====FareStructure Key ========================== -->
-		<xsd:keyref name="FareStructure_KeyRef" refer="netex:FareStructure_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FareStructureRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="FareStructure_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FareStructure"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====FareStructureElement============================== -->
 		<!-- =====FareStructureElement unique========================== -->
 		<xsd:unique name="FareStructureElement_UniqueBy_Id_Version">
@@ -9591,17 +9111,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====FareElementInSequence Key ========================== -->
-		<xsd:keyref name="FareElementInSequence_KeyRef" refer="netex:FareElementInSequence_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FareElementInSequenceRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="FareElementInSequence_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FareElementInSequence"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====TypeOfFareStructureElement============================== -->
 		<!-- =====TypeOfFareStructureElement unique========================== -->
 		<xsd:unique name="TypeOfFareStructureElement_UniqueBy_Id_Version">
@@ -10217,12 +9726,12 @@
 		</xsd:unique>
 		<!-- =====Cell Key ========================== -->
 		<xsd:keyref name="Cell_KeyRef" refer="netex:Cell_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:CellRef | .//netex:StandardCellRef"/>
+			<xsd:selector xpath=".//netex:CellRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Cell_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:Cell | .//netex:StandardCell"/>
+			<xsd:selector xpath=".//netex:Cell"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -10392,7 +9901,7 @@
 		</xsd:unique>
 		<!-- =====FareZone Key ========================== -->
 		<xsd:keyref name="FareZone_KeyRef" refer="netex:FareZone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FareZoneRef | .//netex:ParentFareZoneRef | .//netex:FromFareZoneRef | .//netex:ToFareZoneRef | .//netex:ProjectedObjectRef"/>
+			<xsd:selector xpath=".//netex:FareZoneRef | .//netex:ParentFareZoneRef | .//netex:ProjectedObjectRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -10535,7 +10044,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<xsd:keyref name="CommercialProfile_KeyRef" refer="netex:CommercialProfile_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:CommercialProfileRef | .//netex:BaseCommercialProfileRef"/>
+			<xsd:selector xpath=".//netex:CommercialProfileRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -10915,7 +10424,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<xsd:keyref name="UserProfile_KeyRef" refer="netex:UserProfile_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:UserProfileRef | .//netex:BaseUserProfileRef | .//netex:CompanionProfile/ParentRef | .//netex:VehiclePoolerProfileRef"/>
+			<xsd:selector xpath=".//netex:UserProfileRef | .//netex:BaseUserProfileRef | .//netex:VehiclePoolerProfileRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -10998,17 +10507,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====GenericParameterAssignment Key ========================== -->
-		<xsd:keyref name="GenericParameterAssignment_KeyRef" refer="netex:GenericParameterAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:GenericParameterAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="GenericParameterAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:GenericParameterAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====SpecificParameterAssignment============================== -->
 		<!-- =====SpecificParameterAssignment unique========================== -->
 		<xsd:unique name="SpecificParameterAssignment_UniqueBy_Id_Version_Order">
@@ -11019,17 +10517,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====SpecificParameterAssignment Key ========================== -->
-		<xsd:keyref name="SpecificParameterAssignment_KeyRef" refer="netex:SpecificParameterAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:SpecificParameterAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="SpecificParameterAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:SpecificParameterAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====CustomerPurchaseParameterAssignment============================== -->
 		<!-- =====CustomerPurchaseParameterAssignment unique========================== -->
 		<xsd:unique name="CustomerPurchaseParameterAssignment_UniqueBy_Id_Version_Order">
@@ -11040,17 +10527,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====CustomerPurchaseParameterAssignment Key ========================== -->
-		<xsd:keyref name="CustomerPurchaseParameterAssignment_KeyRef" refer="netex:CustomerPurchaseParameterAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:CustomerPurchaseParameterAssignmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="CustomerPurchaseParameterAssignment_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:CustomerPurchaseParameterAssignment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====TypeOfAccessRightAssignment============================== -->
 		<!-- =====TypeOfAccessRightAssignment unique========================== -->
 		<xsd:unique name="TypeOfAccessRightAssignment_UniqueBy_Id_Version">
@@ -12016,27 +11492,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====FareContractEntry============================== -->
-		<!-- =====FareContract unique========================== -->
-		<xsd:unique name="FareContractEntry_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [FareContractEntry Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:FareContractEntry"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====Contract Key ========================== -->
-		<xsd:keyref name="FareContractEntry_KeyRef" refer="netex:FareContractEntry_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FareContractEntryRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="FareContractEntry_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FareContractEntry"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- ===== CustomerAccount============================== -->
 		<!-- =====TypeOfCustomerAccount============================== -->
 		<!-- =====TypeOfCustomerAccount unique========================== -->