diff --git a/specifications/common/terminology.md b/specifications/common/terminology.md
index 4ebef6f..8545083 100644
--- a/specifications/common/terminology.md
+++ b/specifications/common/terminology.md
@@ -44,7 +44,7 @@ governance framework and supporting services to build trustworthiness and enable
 
 [SOURCE: ISO/IEC 20151 to be published]
 
-Note 1 to entry: This specification convers only protocols to facilitate interoperable [=Dataset=] sharing between entities based on technical services. The overarching concepts and characteristics of Dataspaces are described in ISO/IEC 20151.
+Note 1 to entry: This specification covers only protocols to facilitate interoperable [=Dataset=] sharing between entities based on technical services. The overarching concepts and characteristics of Dataspaces are described in ISO/IEC 20151.
 
 <dfn>Dataspace Protocol</dfn>
 
diff --git a/specifications/negotiation/message/diagram/contract-agreement-message.png b/specifications/negotiation/message/diagram/contract-agreement-message.png
deleted file mode 100644
index 69c497f..0000000
Binary files a/specifications/negotiation/message/diagram/contract-agreement-message.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-agreement-message.puml b/specifications/negotiation/message/diagram/contract-agreement-message.puml
deleted file mode 100644
index 4512dba..0000000
--- a/specifications/negotiation/message/diagram/contract-agreement-message.puml
+++ /dev/null
@@ -1,27 +0,0 @@
-@startuml "contract-agreement-message"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractAgreementMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : "dspace:ContractAgreementMessage"
-    dspace:providerPid : String
-    dspace:consumerPid : String
-}
-
-class odrl:Agreement {
-    @type : "odrl:Agreement"
-    @id: String
-    odrl:target : xsd:anyURI
-    dspace:timestamp : xsd:dateTime
-    odrl:assignee : String
-    odrl:assigner : String
-}
-
-"dspace:ContractAgreementMessage" "1" *-- "1" "odrl:Agreement" : "dspace:agreement"
-
-@enduml
diff --git a/specifications/negotiation/message/diagram/contract-agreement-verification-message.png b/specifications/negotiation/message/diagram/contract-agreement-verification-message.png
deleted file mode 100644
index 1ff82d1..0000000
Binary files a/specifications/negotiation/message/diagram/contract-agreement-verification-message.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-agreement-verification-message.puml b/specifications/negotiation/message/diagram/contract-agreement-verification-message.puml
deleted file mode 100644
index a830a74..0000000
--- a/specifications/negotiation/message/diagram/contract-agreement-verification-message.puml
+++ /dev/null
@@ -1,17 +0,0 @@
-@startuml "contract-agreement-verification-message"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractAgreementVerificationMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : "dspace:ContractAgreementVerificationMessage"
-    dspace:providerPid : String
-    dspace:consumerPid : String
-}
-
-
-@enduml
\ No newline at end of file
diff --git a/specifications/negotiation/message/diagram/contract-negotiation-error.png b/specifications/negotiation/message/diagram/contract-negotiation-error.png
deleted file mode 100644
index 392aef0..0000000
Binary files a/specifications/negotiation/message/diagram/contract-negotiation-error.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-negotiation-error.puml b/specifications/negotiation/message/diagram/contract-negotiation-error.puml
deleted file mode 100644
index 6d4071a..0000000
--- a/specifications/negotiation/message/diagram/contract-negotiation-error.puml
+++ /dev/null
@@ -1,25 +0,0 @@
-@startuml "contract-negotiation-error"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractNegotiationError" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : "dspace:ContractNegotiationError"
-    dspace:providerPid : String
-    dspace:consumerPid : String
-    dspace:code : String
-    dspace:reason : Array
-}
-
-class "MultilanguageProperty" {
-    @language : BCP47 Language-Tag
-    @value: String
-}
-
-"dspace:ContractNegotiationError" "1" *-- "*" "MultilanguageProperty" : "dct:description"
-
-@enduml
\ No newline at end of file
diff --git a/specifications/negotiation/message/diagram/contract-negotiation-event-message.png b/specifications/negotiation/message/diagram/contract-negotiation-event-message.png
deleted file mode 100644
index 321d32f..0000000
Binary files a/specifications/negotiation/message/diagram/contract-negotiation-event-message.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-negotiation-event-message.puml b/specifications/negotiation/message/diagram/contract-negotiation-event-message.puml
deleted file mode 100644
index 193c5fd..0000000
--- a/specifications/negotiation/message/diagram/contract-negotiation-event-message.puml
+++ /dev/null
@@ -1,23 +0,0 @@
-@startuml "contract-negotiation-event-message"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractNegotiationEventMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : "dspace:ContractNegotiationEventMessage"
-    dspace:providerPid : String
-    dspace:consumerPid : String
-}
-
-enum dspace:NegotiationEvent {
-    dspace:ACCEPTED
-    dspace:FINALIZED
-}
-
-"dspace:ContractNegotiationEventMessage" "1" *-- "1" "dspace:NegotiationEvent" : "dspace:eventType"
-
-@enduml
\ No newline at end of file
diff --git a/specifications/negotiation/message/diagram/contract-negotiation-termination-message.png b/specifications/negotiation/message/diagram/contract-negotiation-termination-message.png
deleted file mode 100644
index 24a256a..0000000
Binary files a/specifications/negotiation/message/diagram/contract-negotiation-termination-message.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-negotiation-termination-message.puml b/specifications/negotiation/message/diagram/contract-negotiation-termination-message.puml
deleted file mode 100644
index 9d4f210..0000000
--- a/specifications/negotiation/message/diagram/contract-negotiation-termination-message.puml
+++ /dev/null
@@ -1,18 +0,0 @@
-@startuml "contract-negotiation-termination-message"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractNegotiationTerminationMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : "dspace:ContractNegotiationTerminationMessage"
-    dspace:providerPid : String
-    dspace:consumerPid : String
-    dspace:code : String
-    dspace:reason : Array
-}
-
-@enduml
\ No newline at end of file
diff --git a/specifications/negotiation/message/diagram/contract-negotiation.png b/specifications/negotiation/message/diagram/contract-negotiation.png
deleted file mode 100644
index 305028d..0000000
Binary files a/specifications/negotiation/message/diagram/contract-negotiation.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-negotiation.puml b/specifications/negotiation/message/diagram/contract-negotiation.puml
deleted file mode 100644
index 9bdfc73..0000000
--- a/specifications/negotiation/message/diagram/contract-negotiation.puml
+++ /dev/null
@@ -1,29 +0,0 @@
-@startuml "contract-negotiation"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractNegotiation" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : "dspace:ContractNegotiation"
-    dspace:providerPid : String
-    dspace:consumerPid : String
-}
-
-enum dspace:NegotiationState {
-    "dspace:REQUESTED"
-    "dspace:OFFERED"
-    "dspace:ACCEPTED"
-    "dspace:AGREED"
-    "dspace:VERIFIED"
-    "dspace:FINALIZED"
-    "dspace:TERMINATED"
-    "..."
-}
-
-"dspace:ContractNegotiation" "1" *-- "1" "dspace:NegotiationState" : "dspace:state"
-
-@enduml
diff --git a/specifications/negotiation/message/diagram/contract-offer-message.png b/specifications/negotiation/message/diagram/contract-offer-message.png
deleted file mode 100644
index c058254..0000000
Binary files a/specifications/negotiation/message/diagram/contract-offer-message.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-offer-message.puml b/specifications/negotiation/message/diagram/contract-offer-message.puml
deleted file mode 100644
index 0eac801..0000000
--- a/specifications/negotiation/message/diagram/contract-offer-message.puml
+++ /dev/null
@@ -1,24 +0,0 @@
-@startuml "contract-offer-message"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractOfferMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : dspace:ContractOfferMessage
-    dspace:providerPid : String
-    dspace:consumerPid : String
-}
-
-class odrl:Offer {
-    @type : odrl:Offer,
-    @id: String
-    odrl:target : xsd:anyURI
-}
-
-"dspace:ContractOfferMessage" "1" *-- "1" "odrl:Offer" : "dspace:offer"
-
-@enduml
\ No newline at end of file
diff --git a/specifications/negotiation/message/diagram/contract-offer-message_initial.png b/specifications/negotiation/message/diagram/contract-offer-message_initial.png
deleted file mode 100644
index 29bac76..0000000
Binary files a/specifications/negotiation/message/diagram/contract-offer-message_initial.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-offer-message_initial.puml b/specifications/negotiation/message/diagram/contract-offer-message_initial.puml
deleted file mode 100644
index 2788c5a..0000000
--- a/specifications/negotiation/message/diagram/contract-offer-message_initial.puml
+++ /dev/null
@@ -1,24 +0,0 @@
-@startuml "contract-offer-message"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractOfferMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : dspace:ContractOfferMessage
-    dspace:providerPid : String
-    dspace:callbackAddress : String
-}
-
-class odrl:Offer {
-    @type : odrl:Offer,
-    @id: String
-    odrl:target : xsd:anyURI
-}
-
-"dspace:ContractOfferMessage" "1" *-- "1" "odrl:Offer" : "dspace:offer"
-
-@enduml
\ No newline at end of file
diff --git a/specifications/negotiation/message/diagram/contract-request-message.png b/specifications/negotiation/message/diagram/contract-request-message.png
deleted file mode 100644
index 537d649..0000000
Binary files a/specifications/negotiation/message/diagram/contract-request-message.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-request-message.puml b/specifications/negotiation/message/diagram/contract-request-message.puml
deleted file mode 100644
index f146a77..0000000
--- a/specifications/negotiation/message/diagram/contract-request-message.puml
+++ /dev/null
@@ -1,25 +0,0 @@
-@startuml "contract-request-message"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractRequestMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : dspace:ContractRequestMessage
-    dspace:providerPid : String
-    dspace:consumerPid : String
-}
-
-class odrl:Offer {
-    @type : odrl:Offer,
-    @id: String
-    odrl:target : xsd:anyURI
-    ...
-}
-
-"dspace:ContractRequestMessage" "1" *-- "1" "odrl:Offer" : "dspace:offer"
-
-@enduml
\ No newline at end of file
diff --git a/specifications/negotiation/message/diagram/contract-request-message_initial.png b/specifications/negotiation/message/diagram/contract-request-message_initial.png
deleted file mode 100644
index b50eefb..0000000
Binary files a/specifications/negotiation/message/diagram/contract-request-message_initial.png and /dev/null differ
diff --git a/specifications/negotiation/message/diagram/contract-request-message_initial.puml b/specifications/negotiation/message/diagram/contract-request-message_initial.puml
deleted file mode 100644
index dee2104..0000000
--- a/specifications/negotiation/message/diagram/contract-request-message_initial.puml
+++ /dev/null
@@ -1,25 +0,0 @@
-@startuml "contract-request-message_initial"
-!pragma layout smetana
-
-!include ../../../common/style/diagram.styles.puml
-
-hide empty description
-
-
-class "dspace:ContractRequestMessage" {
-    @context : "https://w3id.org/dspace/2025/1/context.jsonld"
-    @type : dspace:ContractRequestMessage
-    dspace:consumerPid : String
-    dspace:callbackAddress : String
-}
-
-class odrl:Offer {
-    @type : odrl:Offer,
-    @id: String
-    odrl:target : xsd:anyURI
-    ...
-}
-
-"dspace:ContractRequestMessage" "1" *-- "*" "odrl:Offer" : "dspace:offer"
-
-@enduml