diff --git a/CHANGELOG.md b/CHANGELOG.md
index dea223f6..334f2409 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,9 +44,7 @@ Expected: September, 2021
* Added yangs:
* ietf-restconf-list-pagination@2015-01-30.yang
* clixon-netconf-list-pagination@2021-08-27.yang
- * ietf-origin@2018-02-14.yang
* ietf-yang-metadata@2016-08-05.yang
- * ietf-netconf-with-defaults@2011-06-01.yang
* New state callback signature (ca_statedata2)
* The new callback contains parameters for pagination
* Goal is to replace ca_statedata callback
diff --git a/yang/mandatory/Makefile.in b/yang/mandatory/Makefile.in
index cc481cab..2c19abd0 100644
--- a/yang/mandatory/Makefile.in
+++ b/yang/mandatory/Makefile.in
@@ -51,9 +51,8 @@ YANGSPECS += ietf-yang-library@2019-01-04.yang
YANGSPECS += ietf-yang-types@2013-07-15.yang
YANGSPECS += ietf-datastores@2018-02-14.yang
YANGSPECS += ietf-yang-patch@2017-02-22.yang
-YANGSPECS += ietf-origin@2018-02-14.yang
+# For remaining attribute in list-pagination:
YANGSPECS += ietf-yang-metadata@2016-08-05.yang
-YANGSPECS += ietf-netconf-with-defaults@2011-06-01.yang
# in draft-wwlh-netconf-list-pagination:
YANGSPECS += ietf-netconf-list-pagination@2020-10-30.yang
# in draft-wwlh-netconf-list-pagination-rc:
diff --git a/yang/mandatory/ietf-netconf-with-defaults@2011-06-01.yang b/yang/mandatory/ietf-netconf-with-defaults@2011-06-01.yang
deleted file mode 100644
index 8a7be8c2..00000000
--- a/yang/mandatory/ietf-netconf-with-defaults@2011-06-01.yang
+++ /dev/null
@@ -1,138 +0,0 @@
-module ietf-netconf-with-defaults {
-
- namespace "urn:ietf:params:xml:ns:yang:ietf-netconf-with-defaults";
-
- prefix ncwd;
-
- import ietf-netconf { prefix nc; }
-
- organization
- "IETF NETCONF (Network Configuration Protocol) Working Group";
-
- contact
- "WG Web:
-
- WG List:
-
- WG Chair: Bert Wijnen
-
-
- WG Chair: Mehmet Ersue
-
-
- Editor: Andy Bierman
-
-
- Editor: Balazs Lengyel
- ";
-
- description
- "This module defines an extension to the NETCONF protocol
- that allows the NETCONF client to control how default
- values are handled by the server in particular NETCONF
- operations.
-
- Copyright (c) 2011 IETF Trust and the persons identified as
- the document authors. All rights reserved.
-
- Redistribution and use in source and binary forms, with or
- without modification, is permitted pursuant to, and subject
- to the license terms contained in, the Simplified BSD License
- set forth in Section 4.c of the IETF Trust's Legal Provisions
- Relating to IETF Documents
- (http://trustee.ietf.org/license-info).
-
- This version of this YANG module is part of RFC 6243; see
- the RFC itself for full legal notices.";
- revision 2011-06-01 {
- description
- "Initial version.";
- reference
- "RFC 6243: With-defaults Capability for NETCONF";
- }
-
- typedef with-defaults-mode {
- description
- "Possible modes to report default data.";
- reference
- "RFC 6243; Section 3.";
- type enumeration {
- enum report-all {
- description
- "All default data is reported.";
- reference
- "RFC 6243; Section 3.1";
- }
- enum report-all-tagged {
- description
- "All default data is reported.
- Any nodes considered to be default data
- will contain a 'default' XML attribute,
- set to 'true' or '1'.";
- reference
- "RFC 6243; Section 3.4";
- }
- enum trim {
- description
- "Values are not reported if they contain the default.";
- reference
- "RFC 6243; Section 3.2";
- }
- enum explicit {
- description
- "Report values that contain the definition of
- explicitly set data.";
- reference
- "RFC 6243; Section 3.3";
- }
- }
- }
-
- grouping with-defaults-parameters {
- description
- "Contains the parameter for control
- of defaults in NETCONF retrieval operations.";
- leaf with-defaults {
- description
- "The explicit defaults processing mode requested.";
- reference
- "RFC 6243; Section 4.5.1";
-
- type with-defaults-mode;
- }
- }
-
- // extending the get-config operation
- augment /nc:get-config/nc:input {
- description
- "Adds the parameter to the
- input of the NETCONF operation.";
- reference
- "RFC 6243; Section 4.5.1";
-
- uses with-defaults-parameters;
- }
-
- // extending the get operation
- augment /nc:get/nc:input {
- description
- "Adds the parameter to
- the input of the NETCONF operation.";
- reference
- "RFC 6243; Section 4.5.1";
-
- uses with-defaults-parameters;
- }
-
- // extending the copy-config operation
- augment /nc:copy-config/nc:input {
- description
- "Adds the parameter to
- the input of the NETCONF operation.";
- reference
- "RFC 6243; Section 4.5.1";
-
- uses with-defaults-parameters;
- }
-
-}
diff --git a/yang/mandatory/ietf-origin@2018-02-14.yang b/yang/mandatory/ietf-origin@2018-02-14.yang
deleted file mode 100644
index 3080c911..00000000
--- a/yang/mandatory/ietf-origin@2018-02-14.yang
+++ /dev/null
@@ -1,147 +0,0 @@
-module ietf-origin {
- yang-version 1.1;
- namespace "urn:ietf:params:xml:ns:yang:ietf-origin";
- prefix or;
-
- import ietf-yang-metadata {
- prefix md;
- }
-
- organization
- "IETF Network Modeling (NETMOD) Working Group";
-
- contact
- "WG Web:
-
- WG List:
-
- Author: Martin Bjorklund
-
-
- Author: Juergen Schoenwaelder
-
-
- Author: Phil Shafer
-
-
- Author: Kent Watsen
-
-
- Author: Rob Wilton
- ";
-
- description
- "This YANG module defines an 'origin' metadata annotation and a
- set of identities for the origin value.
-
- Copyright (c) 2018 IETF Trust and the persons identified as
- authors of the code. All rights reserved.
-
- Redistribution and use in source and binary forms, with or
- without modification, is permitted pursuant to, and subject to
- the license terms contained in, the Simplified BSD License set
- forth in Section 4.c of the IETF Trust's Legal Provisions
- Relating to IETF Documents
- (https://trustee.ietf.org/license-info).
-
- This version of this YANG module is part of RFC 8342
- (https://www.rfc-editor.org/info/rfc8342); see the RFC itself
- for full legal notices.";
-
- revision 2018-02-14 {
- description
- "Initial revision.";
- reference
- "RFC 8342: Network Management Datastore Architecture (NMDA)";
- }
-
- /*
- * Identities
- */
-
- identity origin {
- description
- "Abstract base identity for the origin annotation.";
- }
-
- identity intended {
- base origin;
- description
- "Denotes configuration from the intended configuration
- datastore.";
- }
-
- identity dynamic {
- base origin;
- description
- "Denotes configuration from a dynamic configuration
- datastore.";
- }
-
- identity system {
- base origin;
- description
- "Denotes configuration originated by the system itself.
-
- Examples of system configuration include applied configuration
- for an always-existing loopback interface, or interface
- configuration that is auto-created due to the hardware
- currently present in the device.";
- }
-
- identity learned {
- base origin;
- description
- "Denotes configuration learned from protocol interactions with
- other devices, instead of via either the intended
- configuration datastore or any dynamic configuration
- datastore.
-
- Examples of protocols that provide learned configuration
- include link-layer negotiations, routing protocols, and
- DHCP.";
- }
-
- identity default {
- base origin;
- description
- "Denotes configuration that does not have a configured or
- learned value but has a default value in use. Covers both
- values defined in a 'default' statement and values defined
- via an explanation in a 'description' statement.";
- }
-
- identity unknown {
- base origin;
- description
- "Denotes configuration for which the system cannot identify the
- origin.";
- }
-
- /*
- * Type definitions
- */
-
- typedef origin-ref {
- type identityref {
- base origin;
- }
- description
- "An origin identity reference.";
- }
-
- /*
- * Metadata annotations
- */
-
- md:annotation origin {
- type origin-ref;
- description
- "The 'origin' annotation can be present on any configuration
- data node in the operational state datastore. It specifies
- from where the node originated. If not specified for a given
- configuration data node, then the origin is the same as the
- origin of its parent node in the data tree. The origin for
- any top-level configuration data nodes must be specified.";
- }
-}