diff --git a/api/PaymentAddress.json b/api/PaymentAddress.json
index 1a00f066d259bb..7fb3efee921b9a 100644
--- a/api/PaymentAddress.json
+++ b/api/PaymentAddress.json
@@ -14,12 +14,10 @@
             "version_added": "15"
           },
           "firefox": {
-            "version_added": false,
-            "notes": "Available only in nightly builds. Requires <code>dom.payments.request.enabled</code> to be set to <code>true</code> and the comma-delineated list in <code>dom.payments.request.supportedRegions</code> to contain one or more of the supported 2-character ISO locales, currently US and CA."
+            "version_added": false
           },
           "firefox_android": {
-            "version_added": false,
-            "notes": "Available only in nightly builds. Requires <code>dom.payments.request.enabled</code> to be set to <code>true</code> and the comma-delineated list in <code>dom.payments.request.supportedRegions</code> to contain one or more of the supported 2-character ISO locales, currently US and CA."
+            "version_added": false
           },
           "ie": {
             "version_added": false
@@ -63,12 +61,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -113,12 +109,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -163,12 +157,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -213,12 +205,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -315,12 +305,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -365,12 +353,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -415,12 +401,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -465,12 +449,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -515,12 +497,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -565,12 +545,10 @@
               "version_added": false
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -615,12 +593,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false
@@ -666,12 +642,10 @@
               "version_added": "15"
             },
             "firefox": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "firefox_android": {
-              "version_added": false,
-              "notes": "Available only in nightly builds."
+              "version_added": false
             },
             "ie": {
               "version_added": false