diff --git a/modules/cmpapi/src/encoder/GppModel.ts b/modules/cmpapi/src/encoder/GppModel.ts
index 4b179bf..3b38838 100644
--- a/modules/cmpapi/src/encoder/GppModel.ts
+++ b/modules/cmpapi/src/encoder/GppModel.ts
@@ -373,6 +373,12 @@ export class GppModel {
   }
 
   public decodeSection(sectionName: string, encodedString: string): void {
+    if (!this.decoded) {
+      this.sections = this.decodeModel(this.encodedString);
+      this.dirty = false;
+      this.decoded = true;
+    }
+
     let section: EncodableSection = null;
     if (!this.sections.has(sectionName)) {
       if (sectionName === TcfCaV1.NAME) {
@@ -439,6 +445,7 @@ export class GppModel {
 
     if (section) {
       section.decode(encodedString);
+      this.dirty = true;
     }
   }
 
diff --git a/modules/cmpapi/src/encoder/segment/UsCaCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsCaCoreSegment.ts
index e2ca8ef..4100528 100644
--- a/modules/cmpapi/src/encoder/segment/UsCaCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsCaCoreSegment.ts
@@ -124,137 +124,4 @@ export class UsCaCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsCaCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let sharingOptOutNotice: number = this.fields.get(UsCaField.SHARING_OPT_OUT_NOTICE).getValue();
-    let sharingOptOut: number = this.fields.get(UsCaField.SHARING_OPT_OUT).getValue();
-    let saleOptOutNotice: number = this.fields.get(UsCaField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsCaField.SALE_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsCaField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsCaField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-    let sensitiveDataLimtUserNotice: number = this.fields.get(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE).getValue();
-
-    if (sharingOptOutNotice == 0) {
-      if (sharingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usca sharing notice / opt out combination: {" + sharingOptOutNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    } else if (sharingOptOutNotice == 1) {
-      if (sharingOptOut != 1 && sharingOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usca sharing notice / opt out combination: {" + sharingOptOutNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    } else if (sharingOptOutNotice == 2) {
-      if (sharingOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usca sharing notice / opt out combination: {" + sharingOptOutNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    }
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usca sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usca sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usca sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sharingOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider mode / sharing opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sharingOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sensitiveDataLimtUserNotice != 0) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider mode / sensitive data limit use notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sensitiveDataLimtUserNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sharingOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider mode / sharing opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sharingOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sensitiveDataLimtUserNotice != 0) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider mode / sensitive data limit use notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sensitiveDataLimtUserNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usca mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsCoCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsCoCoreSegment.ts
index 25f5851..73d4b92 100644
--- a/modules/cmpapi/src/encoder/segment/UsCoCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsCoCoreSegment.ts
@@ -117,110 +117,4 @@ export class UsCoCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsCoCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsCoField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsCoField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsCoField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsCoField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsCoField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usco sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usco sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usco sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usco targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usco targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usco targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usco mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usco mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usco mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usco mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsCtCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsCtCoreSegment.ts
index b9af96c..b45ea46 100644
--- a/modules/cmpapi/src/encoder/segment/UsCtCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsCtCoreSegment.ts
@@ -119,110 +119,4 @@ export class UsCtCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsCtCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsCtField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsCtField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsCtField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsCtField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsCtField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsFlCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsFlCoreSegment.ts
index 8d36e96..55442a6 100644
--- a/modules/cmpapi/src/encoder/segment/UsFlCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsFlCoreSegment.ts
@@ -124,110 +124,4 @@ export class UsFlCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsFlCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsFlField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsFlField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsFlField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsFlField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsFlField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usva sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usva sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usva sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usva targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usva targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usva targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsMtCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsMtCoreSegment.ts
index e283dd2..a9c5e62 100644
--- a/modules/cmpapi/src/encoder/segment/UsMtCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsMtCoreSegment.ts
@@ -123,110 +123,4 @@ export class UsMtCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsMtCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsMtField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsMtField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsMtField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsMtField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsMtField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsNatCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsNatCoreSegment.ts
index c63b4d7..8ed8d3f 100644
--- a/modules/cmpapi/src/encoder/segment/UsNatCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsNatCoreSegment.ts
@@ -139,194 +139,4 @@ export class UsNatCoreSegment extends AbstractLazilyEncodableSegment<EncodableBi
       throw new DecodingError("Unable to decode UsNatCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let sharingNotice: number = this.fields.get(UsNatField.SHARING_NOTICE).getValue();
-    let sharingOptOutNotice: number = this.fields.get(UsNatField.SHARING_OPT_OUT_NOTICE).getValue();
-    let sharingOptOut: number = this.fields.get(UsNatField.SHARING_OPT_OUT).getValue();
-    let saleOptOutNotice: number = this.fields.get(UsNatField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsNatField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsNatField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsNatField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsNatField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-    let sensitiveDataLimtUserNotice: number = this.fields.get(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE).getValue();
-
-    if (sharingNotice == 0) {
-      if (sharingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usnat sharing notice / opt out combination: {" + sharingNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    } else if (sharingNotice == 1) {
-      if (sharingOptOut != 1 && sharingOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usnat sharing notice / opt out combination: {" + sharingNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    } else if (sharingNotice == 2) {
-      if (sharingOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usnat sharing notice / opt out combination: {" + sharingNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    }
-
-    if (sharingOptOutNotice == 0) {
-      if (sharingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usnat sharing notice / opt out combination: {" + sharingOptOutNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    } else if (sharingOptOutNotice == 1) {
-      if (sharingOptOut != 1 && sharingOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usnat sharing notice / opt out combination: {" + sharingOptOutNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    } else if (sharingOptOutNotice == 2) {
-      if (sharingOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usnat sharing notice / opt out combination: {" + sharingOptOutNotice + " / " + sharingOptOut + "}"
-        );
-      }
-    }
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usnat sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usnat sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usnat sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usnat targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usnat targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usnat targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sharingOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider mode / sharing opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sharingOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sensitiveDataLimtUserNotice != 0) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider mode / sensitive data limit use notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sensitiveDataLimtUserNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sharingOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider mode / sharing opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sharingOptOutNotice +
-            "}"
-        );
-      }
-
-      if (sensitiveDataLimtUserNotice != 0) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider mode / sensitive data limit use notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            sensitiveDataLimtUserNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usnat mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsOrCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsOrCoreSegment.ts
index 9bee101..977f845 100644
--- a/modules/cmpapi/src/encoder/segment/UsOrCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsOrCoreSegment.ts
@@ -123,110 +123,4 @@ export class UsOrCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsOrCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsOrField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsOrField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsOrField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsOrField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsOrField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsTxCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsTxCoreSegment.ts
index 7f73686..528b113 100644
--- a/modules/cmpapi/src/encoder/segment/UsTxCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsTxCoreSegment.ts
@@ -123,110 +123,4 @@ export class UsTxCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsTxCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsTxField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsTxField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsTxField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsTxField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsTxField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usct targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usct mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsUtCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsUtCoreSegment.ts
index e1d51b3..179c5e3 100644
--- a/modules/cmpapi/src/encoder/segment/UsUtCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsUtCoreSegment.ts
@@ -123,110 +123,4 @@ export class UsUtCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsUtCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsUtField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsUtField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsUtField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsUtField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsUtField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usut sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usut sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usut sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usut targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usut targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usut targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usut mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usut mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usut mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usut mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/src/encoder/segment/UsVaCoreSegment.ts b/modules/cmpapi/src/encoder/segment/UsVaCoreSegment.ts
index 400862e..c62db0c 100644
--- a/modules/cmpapi/src/encoder/segment/UsVaCoreSegment.ts
+++ b/modules/cmpapi/src/encoder/segment/UsVaCoreSegment.ts
@@ -120,110 +120,4 @@ export class UsVaCoreSegment extends AbstractLazilyEncodableSegment<EncodableBit
       throw new DecodingError("Unable to decode UsVaCoreSegment '" + encodedString + "'");
     }
   }
-
-  // overriden
-  public validate(): void {
-    let saleOptOutNotice: number = this.fields.get(UsVaField.SALE_OPT_OUT_NOTICE).getValue();
-    let saleOptOut: number = this.fields.get(UsVaField.SALE_OPT_OUT).getValue();
-    let targetedAdvertisingOptOutNotice: number = this.fields
-      .get(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE)
-      .getValue();
-    let targetedAdvertisingOptOut: number = this.fields.get(UsVaField.TARGETED_ADVERTISING_OPT_OUT).getValue();
-    let mspaServiceProviderMode: number = this.fields.get(UsVaField.MSPA_SERVICE_PROVIDER_MODE).getValue();
-    let mspaOptOutOptionMode: number = this.fields.get(UsVaField.MSPA_OPT_OUT_OPTION_MODE).getValue();
-
-    if (saleOptOutNotice == 0) {
-      if (saleOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usva sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usva sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    } else if (saleOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usva sale notice / opt out combination: {" + saleOptOutNotice + " / " + saleOptOut + "}"
-        );
-      }
-    }
-
-    if (targetedAdvertisingOptOutNotice == 0) {
-      if (targetedAdvertisingOptOut != 0) {
-        throw new ValidationError(
-          "Invalid usva targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 1) {
-      if (saleOptOut != 1 && saleOptOut != 2) {
-        throw new ValidationError(
-          "Invalid usva targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    } else if (targetedAdvertisingOptOutNotice == 2) {
-      if (saleOptOut != 1) {
-        throw new ValidationError(
-          "Invalid usva targeted advertising notice / opt out combination: {" +
-            targetedAdvertisingOptOutNotice +
-            " / " +
-            targetedAdvertisingOptOut +
-            "}"
-        );
-      }
-    }
-
-    if (mspaServiceProviderMode == 0) {
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 1) {
-      if (mspaOptOutOptionMode != 2) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaServiceProviderMode +
-            "}"
-        );
-      }
-
-      if (saleOptOutNotice != 0) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider mode / sale opt out notice combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            saleOptOutNotice +
-            "}"
-        );
-      }
-    } else if (mspaServiceProviderMode == 2) {
-      if (mspaOptOutOptionMode != 1) {
-        throw new ValidationError(
-          "Invalid usva mspa service provider / opt out option modes combination: {" +
-            mspaServiceProviderMode +
-            " / " +
-            mspaOptOutOptionMode +
-            "}"
-        );
-      }
-    }
-  }
 }
diff --git a/modules/cmpapi/test/encoder/section/UsCa.test.ts b/modules/cmpapi/test/encoder/section/UsCa.test.ts
index f1553c1..1af0f67 100644
--- a/modules/cmpapi/test/encoder/section/UsCa.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsCa.test.ts
@@ -81,263 +81,6 @@ describe("manifest.section.UsCa", (): void => {
     }).to.throw();
   });
 
-  it("should validate sharing", (): void => {
-    let usCa = new UsCa();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 1);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 0);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 2);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 0);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 2);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 2);
-      usCa.encode();
-    }).to.throw();
-
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 0);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 1);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 1);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 1);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 2);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 2);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT, 1);
-    usCa.encode();
-  });
-
-  it("should validate sale", (): void => {
-    let usCa = new UsCa();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 0);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 0);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 1);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 0);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 2);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 0);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 2);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 2);
-      usCa.encode();
-    }).to.throw();
-
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 0);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 1);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 1);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 1);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 2);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 2);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT, 1);
-    usCa.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usCa = new UsCa();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 2);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 1);
-      usCa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 2);
-      usCa.encode();
-    }).to.throw();
-
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 0);
-    usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 1);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 1);
-    usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 1);
-    usCa.encode();
-
-    usCa.setFieldValue(UsCaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCa.setFieldValue(UsCaField.SALE_OPT_OUT_NOTICE, 2);
-    usCa.setFieldValue(UsCaField.SHARING_OPT_OUT_NOTICE, 2);
-    usCa.setFieldValue(UsCaField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 2);
-    usCa.encode();
-  });
-
   it("should decode BVWSSSVY.YA", (): void => {
     let usCa = new UsCa("BVWSSSVY.YA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsCo.test.ts b/modules/cmpapi/test/encoder/section/UsCo.test.ts
index 8eb6caf..a49012a 100644
--- a/modules/cmpapi/test/encoder/section/UsCo.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsCo.test.ts
@@ -76,202 +76,6 @@ describe("manifest.section.UsCo", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usCo = new UsCo();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 0);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 1);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 0);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 2);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 1);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 0);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 2);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 0);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 2);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 2);
-      usCo.encode();
-    }).to.throw();
-
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 0);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 0);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 1);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 1);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 1);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 2);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 2);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT, 1);
-    usCo.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usCo = new UsCo();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usCo.encode();
-    }).to.throw();
-
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usCo.setFieldValue(UsCoField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usCo.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usCo = new UsCo();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 1);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 2);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 1);
-      usCo.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 2);
-      usCo.encode();
-    }).to.throw();
-
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 0);
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 0);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 0);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 0);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 1);
-    usCo.encode();
-
-    usCo.setFieldValue(UsCoField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCo.setFieldValue(UsCoField.SALE_OPT_OUT_NOTICE, 2);
-    usCo.encode();
-  });
-
   it("should decode BVWSSVg.YA", (): void => {
     let usCo = new UsCo("BVWSSVg.YA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsCt.test.ts b/modules/cmpapi/test/encoder/section/UsCt.test.ts
index 5c94771..35fb7a7 100644
--- a/modules/cmpapi/test/encoder/section/UsCt.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsCt.test.ts
@@ -76,202 +76,6 @@ describe("manifest.section.UsCt", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usCt = new UsCt();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 0);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 1);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 0);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 2);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 1);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 0);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 2);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 0);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 2);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 2);
-      usCt.encode();
-    }).to.throw();
-
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 0);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 0);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 1);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 1);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 1);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 2);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 2);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT, 1);
-    usCt.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usCt = new UsCt();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usCt.encode();
-    }).to.throw();
-
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usCt.setFieldValue(UsCtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usCt.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usCt = new UsCt();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 1);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 2);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 1);
-      usCt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 2);
-      usCt.encode();
-    }).to.throw();
-
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 0);
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 0);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 0);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 0);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 1);
-    usCt.encode();
-
-    usCt.setFieldValue(UsCtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usCt.setFieldValue(UsCtField.SALE_OPT_OUT_NOTICE, 2);
-    usCt.encode();
-  });
-
   it("should decode BVWSSZFg.YA", (): void => {
     let usCt = new UsCt("BVWSSZFg.YA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsFl.test.ts b/modules/cmpapi/test/encoder/section/UsFl.test.ts
index 259788c..b52c0cf 100644
--- a/modules/cmpapi/test/encoder/section/UsFl.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsFl.test.ts
@@ -74,202 +74,6 @@ describe("manifest.section.UsFl", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usFl = new UsFl();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 0);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 1);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 0);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 2);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 1);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 0);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 2);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 0);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 2);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 2);
-      usFl.encode();
-    }).to.throw();
-
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 0);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 0);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 1);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 1);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 1);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 2);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 2);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT, 1);
-    usFl.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usFl = new UsFl();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usFl.encode();
-    }).to.throw();
-
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usFl.setFieldValue(UsFlField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usFl.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usFl = new UsFl();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 1);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 2);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 1);
-      usFl.encode();
-    }).to.throw();
-
-    expect(function () {
-      usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 2);
-      usFl.encode();
-    }).to.throw();
-
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 0);
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 0);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 0);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 0);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 1);
-    usFl.encode();
-
-    usFl.setFieldValue(UsFlField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usFl.setFieldValue(UsFlField.SALE_OPT_OUT_NOTICE, 2);
-    usFl.encode();
-  });
-
   it("should decode BVWSSZlY", (): void => {
     let usFl = new UsFl("BVWSSZlY");
 
diff --git a/modules/cmpapi/test/encoder/section/UsMt.test.ts b/modules/cmpapi/test/encoder/section/UsMt.test.ts
index a69c233..962c832 100644
--- a/modules/cmpapi/test/encoder/section/UsMt.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsMt.test.ts
@@ -81,202 +81,6 @@ describe("manifest.section.UsMt", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usMt = new UsMt();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 0);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 1);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 0);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 2);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 1);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 0);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 2);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 0);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 2);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 2);
-      usMt.encode();
-    }).to.throw();
-
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 0);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 0);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 1);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 1);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 1);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 2);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 2);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT, 1);
-    usMt.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usMt = new UsMt();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usMt.encode();
-    }).to.throw();
-
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usMt.setFieldValue(UsMtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usMt.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usMt = new UsMt();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 1);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 2);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 1);
-      usMt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 2);
-      usMt.encode();
-    }).to.throw();
-
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 0);
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 0);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 0);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 0);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 1);
-    usMt.encode();
-
-    usMt.setFieldValue(UsMtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usMt.setFieldValue(UsMtField.SALE_OPT_OUT_NOTICE, 2);
-    usMt.encode();
-  });
-
   it("should decode BVWSSZFY.YA", (): void => {
     let usMt = new UsMt("BVWSSZFY.YA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsNat.test.ts b/modules/cmpapi/test/encoder/section/UsNat.test.ts
index bc0fe20..4e369d2 100644
--- a/modules/cmpapi/test/encoder/section/UsNat.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsNat.test.ts
@@ -101,312 +101,6 @@ describe("manifest.section.UsNat", (): void => {
     }).to.throw();
   });
 
-  it("should validate sharing", (): void => {
-    let usNat = new UsNat();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 0);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 1);
-      usNat.encode();
-    }).to.throw();
-    /*
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 0);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 1);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 2);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 2);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 2);
-      usNat.encode();
-    }).to.throw();
-*/
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 0);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 1);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 2);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 2);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT, 1);
-    usNat.encode();
-  });
-
-  it("should validate sale", (): void => {
-    let usNat = new UsNat();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 0);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 0);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 1);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 2);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 2);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 2);
-      usNat.encode();
-    }).to.throw();
-
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 0);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 1);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 2);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 2);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT, 1);
-    usNat.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usNat = new UsNat();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usNat.encode();
-    }).to.throw();
-
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usNat.setFieldValue(UsNatField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usNat.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usNat = new UsNat();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 2);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 1);
-      usNat.encode();
-    }).to.throw();
-
-    expect(function () {
-      usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 2);
-      usNat.encode();
-    }).to.throw();
-
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 0);
-    usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 0);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 1);
-    usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 1);
-    usNat.encode();
-
-    usNat.setFieldValue(UsNatField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usNat.setFieldValue(UsNatField.SALE_OPT_OUT_NOTICE, 2);
-    usNat.setFieldValue(UsNatField.SHARING_OPT_OUT_NOTICE, 2);
-    usNat.setFieldValue(UsNatField.SENSITIVE_DATA_LIMIT_USE_NOTICE, 2);
-    usNat.encode();
-  });
-
   it("should decode BVVVkkkkkpFY.YA", (): void => {
     let usNat = new UsNat("BVVVkkkkkpFY.YA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsOr.test.ts b/modules/cmpapi/test/encoder/section/UsOr.test.ts
index 74a8ad7..6340e28 100644
--- a/modules/cmpapi/test/encoder/section/UsOr.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsOr.test.ts
@@ -81,202 +81,6 @@ describe("manifest.section.UsOr", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usOr = new UsOr();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 0);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 1);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 0);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 2);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 1);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 0);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 2);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 0);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 2);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 2);
-      usOr.encode();
-    }).to.throw();
-
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 0);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 0);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 1);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 1);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 1);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 2);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 2);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT, 1);
-    usOr.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usOr = new UsOr();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usOr.encode();
-    }).to.throw();
-
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usOr.setFieldValue(UsOrField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usOr.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usOr = new UsOr();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 1);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 2);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 1);
-      usOr.encode();
-    }).to.throw();
-
-    expect(function () {
-      usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 2);
-      usOr.encode();
-    }).to.throw();
-
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 0);
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 0);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 0);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 0);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 1);
-    usOr.encode();
-
-    usOr.setFieldValue(UsOrField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usOr.setFieldValue(UsOrField.SALE_OPT_OUT_NOTICE, 2);
-    usOr.encode();
-  });
-
   it("should decode BVWSSRpFYA.YA", (): void => {
     let usOr = new UsOr("BVWSSRpFYA.YA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsTx.test.ts b/modules/cmpapi/test/encoder/section/UsTx.test.ts
index 081fabb..12b7f4b 100644
--- a/modules/cmpapi/test/encoder/section/UsTx.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsTx.test.ts
@@ -81,202 +81,6 @@ describe("manifest.section.UsTx", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usTx = new UsTx();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 0);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 1);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 0);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 2);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 1);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 0);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 2);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 0);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 2);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 2);
-      usTx.encode();
-    }).to.throw();
-
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 0);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 0);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 1);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 1);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 1);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 2);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 2);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT, 1);
-    usTx.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usTx = new UsTx();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usTx.encode();
-    }).to.throw();
-
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usTx.setFieldValue(UsTxField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usTx.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usTx = new UsTx();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 1);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 2);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 1);
-      usTx.encode();
-    }).to.throw();
-
-    expect(function () {
-      usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 2);
-      usTx.encode();
-    }).to.throw();
-
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 0);
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 0);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 0);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 0);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 1);
-    usTx.encode();
-
-    usTx.setFieldValue(UsTxField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usTx.setFieldValue(UsTxField.SALE_OPT_OUT_NOTICE, 2);
-    usTx.encode();
-  });
-
   it("should decode BVWSSVWA.YA", (): void => {
     let usTx = new UsTx("BVWSSVWA.YA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsUt.test.ts b/modules/cmpapi/test/encoder/section/UsUt.test.ts
index 65cf8d4..962bf17 100644
--- a/modules/cmpapi/test/encoder/section/UsUt.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsUt.test.ts
@@ -74,202 +74,6 @@ describe("manifest.section.UsUt", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usUt = new UsUt();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 0);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 1);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 0);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 2);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 1);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 0);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 2);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 0);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 2);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 2);
-      usUt.encode();
-    }).to.throw();
-
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 0);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 0);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 1);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 1);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 1);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 2);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 2);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT, 1);
-    usUt.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usUt = new UsUt();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usUt.encode();
-    }).to.throw();
-
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usUt.setFieldValue(UsUtField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usUt.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usUt = new UsUt();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 1);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 2);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 1);
-      usUt.encode();
-    }).to.throw();
-
-    expect(function () {
-      usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 2);
-      usUt.encode();
-    }).to.throw();
-
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 0);
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 0);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 0);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 0);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 1);
-    usUt.encode();
-
-    usUt.setFieldValue(UsUtField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usUt.setFieldValue(UsUtField.SALE_OPT_OUT_NOTICE, 2);
-    usUt.encode();
-  });
-
   it("should decode BVVkklWA", (): void => {
     let usUt = new UsUt("BVVkklWA");
 
diff --git a/modules/cmpapi/test/encoder/section/UsVa.test.ts b/modules/cmpapi/test/encoder/section/UsVa.test.ts
index 2014e5c..a5ff0c0 100644
--- a/modules/cmpapi/test/encoder/section/UsVa.test.ts
+++ b/modules/cmpapi/test/encoder/section/UsVa.test.ts
@@ -69,202 +69,6 @@ describe("manifest.section.UsVa", (): void => {
     }).to.throw();
   });
 
-  it("should validate sale", (): void => {
-    let usVa = new UsVa();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 0);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 1);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 0);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 2);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 1);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 0);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 2);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 0);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 2);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 2);
-      usVa.encode();
-    }).to.throw();
-
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 0);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 0);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 1);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 1);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 1);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 2);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 2);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT, 1);
-    usVa.encode();
-  });
-
-  it("should validate targeted advertising", (): void => {
-    let usVa = new UsVa();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 1);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 0);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-      usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 2);
-      usVa.encode();
-    }).to.throw();
-
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 0);
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 0);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 2);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 2);
-    usVa.setFieldValue(UsVaField.TARGETED_ADVERTISING_OPT_OUT, 1);
-    usVa.encode();
-  });
-
-  it("should validate mspa", (): void => {
-    let usVa = new UsVa();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 1);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-      usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 2);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 1);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 2);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 1);
-      usVa.encode();
-    }).to.throw();
-
-    expect(function () {
-      usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-      usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 2);
-      usVa.encode();
-    }).to.throw();
-
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 0);
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 2);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 1);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_OPT_OUT_OPTION_MODE, 0);
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 0);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 0);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 1);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 0);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 0);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 1);
-    usVa.encode();
-
-    usVa.setFieldValue(UsVaField.MSPA_SERVICE_PROVIDER_MODE, 2);
-    usVa.setFieldValue(UsVaField.SALE_OPT_OUT_NOTICE, 2);
-    usVa.encode();
-  });
-
   it("should decode BVWSSVY", (): void => {
     let usVa = new UsVa("BVWSSVY");