diff --git a/Sources/SpeziFHIR/FHIR+Identifiable.swift b/Sources/SpeziFHIR/FHIR+Identifiable.swift
index f223669..de4fcd2 100644
--- a/Sources/SpeziFHIR/FHIR+Identifiable.swift
+++ b/Sources/SpeziFHIR/FHIR+Identifiable.swift
@@ -15,15 +15,3 @@ extension Resource: Identifiable {
 
 
 extension FHIRPrimitive: Identifiable where PrimitiveType: Identifiable { }
-
-
-extension Optional: Identifiable where Wrapped == FHIRPrimitive<FHIRString> {
-    public var id: FHIRPrimitive<FHIRString>? {
-        switch self {
-        case let .some(value):
-            return value
-        case .none:
-            return nil
-        }
-    }
-}
diff --git a/Sources/SpeziFHIR/OptionalFHIRPrimitiveFHIRString+LosslessStringConvertible.swift b/Sources/SpeziFHIR/OptionalFHIRPrimitiveFHIRString+LosslessStringConvertible.swift
deleted file mode 100644
index 406adda..0000000
--- a/Sources/SpeziFHIR/OptionalFHIRPrimitiveFHIRString+LosslessStringConvertible.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// This source file is part of the Stanford Spezi open-source project
-//
-// SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md)
-//
-// SPDX-License-Identifier: MIT
-//
-
-import ModelsR4
-
-
-extension Optional: CustomStringConvertible, LosslessStringConvertible where Wrapped == FHIRPrimitive<FHIRString> {
-    public var description: String {
-        switch self {
-        case .none:
-            return ""
-        case let .some(wrapped):
-            return wrapped.value?.string ?? ""
-        }
-    }
-    
-    
-    public init?(_ description: String) {
-        self = .some(FHIRPrimitive<FHIRString>(stringLiteral: description))
-    }
-}
diff --git a/Tests/SpeziFHIRTests/SpeziFHIRTests.swift b/Tests/SpeziFHIRTests/SpeziFHIRTests.swift
index a2781c2..9d57069 100644
--- a/Tests/SpeziFHIRTests/SpeziFHIRTests.swift
+++ b/Tests/SpeziFHIRTests/SpeziFHIRTests.swift
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+import SpeziFHIR
 import XCTest