diff --git a/apis/bingmaps.yaml b/apis/bingmaps.yaml
index fddae385db..2045fd7554 100644
--- a/apis/bingmaps.yaml
+++ b/apis/bingmaps.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://dev.virtualearth.net/REST/v1/Locations?CountryRegion=US&adminDistrict=WA&locality=Somewhere&postalCode=98001&addressLine=100%20Main%20St.&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/bitly.yaml b/apis/bitly.yaml
index 5551d02fee..56edf06e97 100644
--- a/apis/bitly.yaml
+++ b/apis/bitly.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://api-ssl.bitly.com/v3/shorten?access_token={{token}}&longUrl=https://www.google.com"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/buttercms.yaml b/apis/buttercms.yaml
index d412bf8581..1b3c0a47e8 100644
--- a/apis/buttercms.yaml
+++ b/apis/buttercms.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://api.buttercms.com/v2/posts/?auth_token={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/circleci.yaml b/apis/circleci.yaml
index 3ec7629cd6..0a77779137 100644
--- a/apis/circleci.yaml
+++ b/apis/circleci.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://circleci.com/api/v1.1/me?circle-token={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/deviantart.yaml b/apis/deviantart.yaml
index 304bd8ce69..94b32417ab 100644
--- a/apis/deviantart.yaml
+++ b/apis/deviantart.yaml
@@ -11,7 +11,6 @@ requests:
   - method: POST
     path:
       - "https://www.deviantart.com/api/v1/oauth2/placebo"
-    headers:
     body: "access_token={{token}}"
     matchers:
       - type: word
diff --git a/apis/googleautocomplete.yaml b/apis/googleautocomplete.yaml
index 89218f3616..abcfedc639 100644
--- a/apis/googleautocomplete.yaml
+++ b/apis/googleautocomplete.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/place/autocomplete/json?input=Bingh&types=%28cities%29&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlecustomsearch.yaml b/apis/googlecustomsearch.yaml
index a3bcfe55d3..e59e03edb3 100644
--- a/apis/googlecustomsearch.yaml
+++ b/apis/googlecustomsearch.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://www.googleapis.com/customsearch/v1?cx=017576662512468239146:omuauf_lfve&q=lectures&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googledirections.yaml b/apis/googledirections.yaml
index 91478e6728..65236a5630 100644
--- a/apis/googledirections.yaml
+++ b/apis/googledirections.yaml
@@ -10,10 +10,9 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/directions/json?origin=Disneyland&destination=Universal+Studios+Hollywood4&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
         words:
           - 'error_message'
-        negative: true
\ No newline at end of file
+        negative: true
diff --git a/apis/googleelevation.yaml b/apis/googleelevation.yaml
index a8c685513d..bd7ef895c5 100644
--- a/apis/googleelevation.yaml
+++ b/apis/googleelevation.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/elevation/json?locations=39.7391536,-104.9847034&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlefindplacefromtext.yaml b/apis/googlefindplacefromtext.yaml
index 26c368fe82..0976a79a37 100644
--- a/apis/googlefindplacefromtext.yaml
+++ b/apis/googlefindplacefromtext.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/place/findplacefromtext/json?input=Museum%20of%20Contemporary%20Art%20Australia&inputtype=textquery&fields=photos,formatted_address,name,rating,opening_hours,geometry&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlegedistancematrix.yaml b/apis/googlegedistancematrix.yaml
index 3c8e8c0f1c..ceab537ca0 100644
--- a/apis/googlegedistancematrix.yaml
+++ b/apis/googlegedistancematrix.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/distancematrix/json?units=imperial&origins=40.6655101,-73.89188969999998&destinations=40.6905615%2C-73.9976592%7C40.6905615%2C-73.9976592%7C40.6905615%2C-73.9976592%7C40.6905615%2C-73.9976592%7C40.6905615%2C-73.9976592%7C40.6905615%2C-73.9976592%7C40.659569%2C-73.933783%7C40.729029%2C-73.851524%7C40.6860072%2C-73.6334271%7C40.598566%2C-73.7527626%7C40.659569%2C-73.933783%7C40.729029%2C-73.851524%7C40.6860072%2C-73.6334271%7C40.598566%2C-73.7527626&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlegeocode.yaml b/apis/googlegeocode.yaml
index 29c641a3fc..204031fd34 100644
--- a/apis/googlegeocode.yaml
+++ b/apis/googlegeocode.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/geocode/json?latlng=40,30&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlegeolocation.yaml b/apis/googlegeolocation.yaml
index 548eeb0d5f..3dd6766951 100644
--- a/apis/googlegeolocation.yaml
+++ b/apis/googlegeolocation.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://www.googleapis.com/geolocation/v1/geolocate?key={{token}}"
-    headers:
     matchers-condition: and
     matchers:
       - type: word
diff --git a/apis/googlemapsembed.yaml b/apis/googlemapsembed.yaml
index 1b6143073f..35c549d87f 100644
--- a/apis/googlemapsembed.yaml
+++ b/apis/googlemapsembed.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://www.google.com/maps/embed/v1/place?q=Seattle&key={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/googlemapsembedadvanced.yaml b/apis/googlemapsembedadvanced.yaml
index ebd7e16135..6815b9aaf2 100644
--- a/apis/googlemapsembedadvanced.yaml
+++ b/apis/googlemapsembedadvanced.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://www.google.com/maps/embed/v1/search?q=record+stores+in+Seattle&key={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/googlenearbysearch.yaml b/apis/googlenearbysearch.yaml
index c26bada610..78db51e9c8 100644
--- a/apis/googlenearbysearch.yaml
+++ b/apis/googlenearbysearch.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/place/nearbysearch/json?location=-33.8670522,151.1957362&radius=100&types=food&name=harbour&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlenearestroads.yaml b/apis/googlenearestroads.yaml
index f6916116f1..1dd7f6e8be 100644
--- a/apis/googlenearestroads.yaml
+++ b/apis/googlenearestroads.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://roads.googleapis.com/v1/nearestRoads?points=60.170880,24.942795|60.170879,24.942796|60.170877,24.942796&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googleplacedetails.yaml b/apis/googleplacedetails.yaml
index 781058d508..23b2d293da 100644
--- a/apis/googleplacedetails.yaml
+++ b/apis/googleplacedetails.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/place/details/json?place_id=ChIJN1t_tDeuEmsRUsoyG83frY4&fields=name,rating,formatted_phone_number&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googleplacesphoto.yaml b/apis/googleplacesphoto.yaml
index 9d9271864c..b2ecc55be0 100644
--- a/apis/googleplacesphoto.yaml
+++ b/apis/googleplacesphoto.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/place/photo?maxwidth=400&photoreference=CnRtAAAATLZNl354RwP_9UKbQ_5Psy40texXePv4oAlgP4qNEkdIrkyse7rPXYGd9D_Uj1rVsQdWT4oRz4QrYAJNpFX7rzqqMlZw2h2E2y5IKMUZ7ouD_SlcHxYq1yL4KbKUv3qtWgTK0A6QbGh87GB3sscrHRIQiG2RrmU_jF4tENr9wGS_YxoUSSDrYjWmrNfeEHSGSc3FyhNLlBU&key={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/googleplayablelocations.yaml b/apis/googleplayablelocations.yaml
index 068ef45d58..1f192e65a5 100644
--- a/apis/googleplayablelocations.yaml
+++ b/apis/googleplayablelocations.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://playablelocations.googleapis.com/v3:samplePlayableLocations?key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googleroutetotraveled.yaml b/apis/googleroutetotraveled.yaml
index e6a943ac1d..c3f197ec99 100644
--- a/apis/googleroutetotraveled.yaml
+++ b/apis/googleroutetotraveled.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://roads.googleapis.com/v1/snapToRoads?path=-35.27801,149.12958|-35.28032,149.12907&interpolate=true&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlespeedlimit.yaml b/apis/googlespeedlimit.yaml
index 785d09e3f0..cc52b5167f 100644
--- a/apis/googlespeedlimit.yaml
+++ b/apis/googlespeedlimit.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://roads.googleapis.com/v1/speedLimits?path=38.75807927603043,-9.03741754643809&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googlestaticmaps.yaml b/apis/googlestaticmaps.yaml
index 35585fd3f2..0036fb01b7 100644
--- a/apis/googlestaticmaps.yaml
+++ b/apis/googlestaticmaps.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/staticmap?center=45%2C10&zoom=7&size=400x400&key={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/googlestreetview.yaml b/apis/googlestreetview.yaml
index 14bfba0f9d..449bee3291 100644
--- a/apis/googlestreetview.yaml
+++ b/apis/googlestreetview.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/streetview?size=400x400&location=40.720032,-73.988354&fov=90&heading=235&pitch=10&key={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/googletextsearchplaces.yaml b/apis/googletextsearchplaces.yaml
index f2975836fc..0331c9c039 100644
--- a/apis/googletextsearchplaces.yaml
+++ b/apis/googletextsearchplaces.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/place/textsearch/json?query=restaurants+in+Sydney&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/googletimezone.yaml b/apis/googletimezone.yaml
index 57db4646be..ef16bc6f14 100644
--- a/apis/googletimezone.yaml
+++ b/apis/googletimezone.yaml
@@ -10,7 +10,6 @@ requests:
   - method: GET
     path:
       - "https://maps.googleapis.com/maps/api/timezone/json?location=39.6034810,-119.6822510&timestamp=1331161200&key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/hubspot.yaml b/apis/hubspot.yaml
index 84ac4ed5de..cdd9d3fdbb 100644
--- a/apis/hubspot.yaml
+++ b/apis/hubspot.yaml
@@ -12,7 +12,6 @@ requests:
     path:
       - "https://api.hubapi.com/owners/v2/owners?hapikey={{token}}"
       - "https://api.hubapi.com/contacts/v1/lists/all/contacts/all?hapikey={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/instagram.yaml b/apis/instagram.yaml
index 885a144e89..261a5f1e71 100644
--- a/apis/instagram.yaml
+++ b/apis/instagram.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://graph.facebook.com/v8.0/me/accounts?access_token={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/ipstack.yaml b/apis/ipstack.yaml
index 1cb3599066..6051b48d6e 100644
--- a/apis/ipstack.yaml
+++ b/apis/ipstack.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://api.ipstack.com/8.8.8.8?access_key={{token}}"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/loqate.yaml b/apis/loqate.yaml
index 4cad66efea..a2497f8487 100644
--- a/apis/loqate.yaml
+++ b/apis/loqate.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "api.addressy.com/Capture/Interactive/Find/v1.00/json3.ws?Key={{token}}&Countries=US,CA&Language=en&Limit=5&Text=BHAR"
-    headers:
     matchers:
       - type: word
         part: body
diff --git a/apis/mapbox.yaml b/apis/mapbox.yaml
index f4dc3ea1a2..0d5536d218 100644
--- a/apis/mapbox.yaml
+++ b/apis/mapbox.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://api.mapbox.com/geocoding/v5/mapbox.places/Los%20Angeles.json?access_token={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/npm.yaml b/apis/npm.yaml
index 415f1ac2c5..ac572f64cd 100644
--- a/apis/npm.yaml
+++ b/apis/npm.yaml
@@ -9,13 +9,10 @@ info:
 
 requests:
   - method: GET
-
-
     path:
       - "https://registry.npmjs.org/-/whoami"
     headers:
       Authorization: Bearer {{token}}
-
     matchers:
       - type: status
         status:
diff --git a/apis/openweather.yaml b/apis/openweather.yaml
index 28828cddbf..b016c21ba4 100644
--- a/apis/openweather.yaml
+++ b/apis/openweather.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://api.openweathermap.org/data/2.5/weather?q=Chicago&appid={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/wakatime.yaml b/apis/wakatime.yaml
index f4d50d0e21..d3682c3708 100644
--- a/apis/wakatime.yaml
+++ b/apis/wakatime.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://wakatime.com/api/v1/users/current/projects/?api_key={{token}}"
-    headers:
     matchers:
       - type: status
         status:
diff --git a/apis/youtube.yaml b/apis/youtube.yaml
index 48cda6e7cb..e348402b76 100644
--- a/apis/youtube.yaml
+++ b/apis/youtube.yaml
@@ -11,7 +11,6 @@ requests:
   - method: GET
     path:
       - "https://www.googleapis.com/youtube/v3/activities?part=contentDetails&maxResults=25&channelId=UC-lHJZR3Gqxm24_Vd_AJ5Yw&key={{token}}"
-    headers:
     matchers-condition: or
     matchers:
       - type: word