diff --git a/README.md b/README.md
index 6bccaf2..0fce2ad 100644
--- a/README.md
+++ b/README.md
@@ -67,8 +67,6 @@ An SLEdge serverless function consists of a shared library (\*.so) and a JSON co
   "expected-execution-us": 600,
   "relative-deadline-us": 2000,
   "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
   "http-req-size": 1024,
   "http-resp-headers": [],
   "http-resp-size": 1024,
diff --git a/runtime/experiments/applications/ekf/by_iteration/spec.json b/runtime/experiments/applications/ekf/by_iteration/spec.json
index ed1858d..0456cfb 100644
--- a/runtime/experiments/applications/ekf/by_iteration/spec.json
+++ b/runtime/experiments/applications/ekf/by_iteration/spec.json
@@ -1,45 +1,39 @@
 {
-  "active": true,
-  "name": "ekf_first_iter",
-  "path": "ekf_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "application/octet-stream",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "application/octet-stream"
+	"active": true,
+	"name": "ekf_first_iter",
+	"path": "ekf_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream"
 },
 {
-  "active": true,
-  "name": "ekf_second_iter",
-  "path": "ekf_wasm.so",
-  "port": 10001,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "application/octet-stream",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "application/octet-stream"
+	"active": true,
+	"name": "ekf_second_iter",
+	"path": "ekf_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream"
 },
 {
-  "active": true,
-  "name": "ekf_third_iter",
-  "path": "ekf_wasm.so",
-  "port": 10002,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "application/octet-stream",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "application/octet-stream"
+	"active": true,
+	"name": "ekf_third_iter",
+	"path": "ekf_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream"
 }
diff --git a/runtime/experiments/applications/ekf/one_iteration/spec.json b/runtime/experiments/applications/ekf/one_iteration/spec.json
index 93822e6..18b4154 100644
--- a/runtime/experiments/applications/ekf/one_iteration/spec.json
+++ b/runtime/experiments/applications/ekf/one_iteration/spec.json
@@ -1,15 +1,13 @@
 {
-  "active": true,
-  "name": "ekf",
-  "path": "ekf_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "application/octet-stream",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "application/octet-stream"
+	"active": true,
+	"name": "ekf",
+	"path": "ekf_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream"
 }
diff --git a/runtime/experiments/applications/imageclassification/spec.json b/runtime/experiments/applications/imageclassification/spec.json
index 16fe3d6..1f02281 100644
--- a/runtime/experiments/applications/imageclassification/spec.json
+++ b/runtime/experiments/applications/imageclassification/spec.json
@@ -1,31 +1,26 @@
 {
-  "active": true,
-  "name": "cifar10_rand",
-  "path": "cifar10_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/bmp",
-  "http-req-size": 4096,
-  "http-resp-headers": [],
-  "http-resp-size": 128,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "cifar10_rand",
+	"path": "cifar10_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain"
 },
 {
- "active": true,
- "name": "cifar10_same",
- "path": "cifar10_wasm.so",
- "port": 10001,
- "expected-execution-us": 5000,
- "relative-deadline-us": 50000,
- "argsize": 1,
- "http-req-headers": [],
- "http-req-content-type": "image/bmp",
- "http-req-size": 4096,
- "http-resp-headers": [],
- "http-resp-size": 128,
- "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "cifar10_same",
+	"path": "cifar10_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain"
 }
- 
\ No newline at end of file
diff --git a/runtime/experiments/applications/imageresize/by_resolution/spec.json b/runtime/experiments/applications/imageresize/by_resolution/spec.json
index 283c0e5..003d39c 100644
--- a/runtime/experiments/applications/imageresize/by_resolution/spec.json
+++ b/runtime/experiments/applications/imageresize/by_resolution/spec.json
@@ -1,45 +1,39 @@
 {
-  "active": true,
-  "name": "resize_small",
-  "path": "resize_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "image/png"
+	"active": true,
+	"name": "resize_small",
+	"path": "resize_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "image/png"
 },
 {
-  "active": true,
-  "name": "resize_medium",
-  "path": "resize_wasm.so",
-  "port": 10001,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "image/png"
+	"active": true,
+	"name": "resize_medium",
+	"path": "resize_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "image/png"
 },
 {
-  "active": true,
-  "name": "resize_large",
-  "path": "resize_wasm.so",
-  "port": 10002,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 1524000,
-  "http-resp-headers": [],
-  "http-resp-size": 1524000,
-  "http-resp-content-type": "image/png"
+	"active": true,
+	"name": "resize_large",
+	"path": "resize_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1524000,
+	"http-resp-headers": [],
+	"http-resp-size": 1524000,
+	"http-resp-content-type": "image/png"
 }
diff --git a/runtime/experiments/applications/imageresize/test/spec.json b/runtime/experiments/applications/imageresize/test/spec.json
index de67977..e2765b7 100644
--- a/runtime/experiments/applications/imageresize/test/spec.json
+++ b/runtime/experiments/applications/imageresize/test/spec.json
@@ -1,15 +1,13 @@
 {
-  "active": true,
-  "name": "resize",
-  "path": "resize_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "image/png"
+	"active": true,
+	"name": "resize",
+	"path": "resize_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "image/png"
 }
diff --git a/runtime/experiments/applications/licenseplate/by_plate_count/spec.json b/runtime/experiments/applications/licenseplate/by_plate_count/spec.json
index 0d106d3..6719e64 100644
--- a/runtime/experiments/applications/licenseplate/by_plate_count/spec.json
+++ b/runtime/experiments/applications/licenseplate/by_plate_count/spec.json
@@ -1,45 +1,39 @@
 {
-  "active": true,
-  "name": "lpd1",
-  "path": "lpd_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 1002400,
-  "http-resp-headers": [],
-  "http-resp-size": 1048576,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "lpd1",
+	"path": "lpd_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "lpd2",
-  "path": "lpd_wasm.so",
-  "port": 10001,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 1002400,
-  "http-resp-headers": [],
-  "http-resp-size": 1048576,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "lpd2",
+	"path": "lpd_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "lpd4",
-  "path": "lpd_wasm.so",
-  "port": 10002,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 1002400,
-  "http-resp-headers": [],
-  "http-resp-size": 1048576,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "lpd4",
+	"path": "lpd_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/applications/ocr/by_dpi/spec.json b/runtime/experiments/applications/ocr/by_dpi/spec.json
index 4b08dff..cdfe478 100644
--- a/runtime/experiments/applications/ocr/by_dpi/spec.json
+++ b/runtime/experiments/applications/ocr/by_dpi/spec.json
@@ -1,45 +1,39 @@
 {
-  "active": true,
-  "name": "gocr_72_dpi",
-  "path": "gocr_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_72_dpi",
+	"path": "gocr_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "gocr_108_dpi",
-  "path": "gocr_wasm.so",
-  "port": 10001,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_108_dpi",
+	"path": "gocr_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "gocr_144_dpi",
-  "path": "gocr_wasm.so",
-  "port": 10002,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_144_dpi",
+	"path": "gocr_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/applications/ocr/by_font/spec.json b/runtime/experiments/applications/ocr/by_font/spec.json
index 18cea93..a3eaaf8 100644
--- a/runtime/experiments/applications/ocr/by_font/spec.json
+++ b/runtime/experiments/applications/ocr/by_font/spec.json
@@ -1,45 +1,39 @@
 {
-  "active": true,
-  "name": "gocr_mono",
-  "path": "gocr_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_mono",
+	"path": "gocr_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "gocr_urw_gothic",
-  "path": "gocr_wasm.so",
-  "port": 10001,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_urw_gothic",
+	"path": "gocr_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "gocr_lobster_2",
-  "path": "gocr_wasm.so",
-  "port": 10002,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_lobster_2",
+	"path": "gocr_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/applications/ocr/by_word/spec.json b/runtime/experiments/applications/ocr/by_word/spec.json
index 6bde0e1..7ceb6d5 100644
--- a/runtime/experiments/applications/ocr/by_word/spec.json
+++ b/runtime/experiments/applications/ocr/by_word/spec.json
@@ -1,45 +1,39 @@
 {
-  "active": true,
-  "name": "gocr_1_word",
-  "path": "gocr_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_1_word",
+	"path": "gocr_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "gocr_10_words",
-  "path": "gocr_wasm.so",
-  "port": 10001,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_10_words",
+	"path": "gocr_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "gocr_100_words",
-  "path": "gocr_wasm.so",
-  "port": 10002,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr_100_words",
+	"path": "gocr_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/applications/ocr/fivebyeight/spec.json b/runtime/experiments/applications/ocr/fivebyeight/spec.json
index 335243a..5627b21 100644
--- a/runtime/experiments/applications/ocr/fivebyeight/spec.json
+++ b/runtime/experiments/applications/ocr/fivebyeight/spec.json
@@ -1,15 +1,13 @@
 {
-  "active": true,
-  "name": "gocr",
-  "path": "gocr_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr",
+	"path": "gocr_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/applications/ocr/handwriting/spec.json b/runtime/experiments/applications/ocr/handwriting/spec.json
index 335243a..5627b21 100644
--- a/runtime/experiments/applications/ocr/handwriting/spec.json
+++ b/runtime/experiments/applications/ocr/handwriting/spec.json
@@ -1,15 +1,13 @@
 {
-  "active": true,
-  "name": "gocr",
-  "path": "gocr_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 36000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024000,
-  "http-resp-headers": [],
-  "http-resp-size": 1024000,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr",
+	"path": "gocr_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 36000,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/applications/ocr/hyde/spec.json b/runtime/experiments/applications/ocr/hyde/spec.json
index f413591..9c91d14 100644
--- a/runtime/experiments/applications/ocr/hyde/spec.json
+++ b/runtime/experiments/applications/ocr/hyde/spec.json
@@ -1,15 +1,13 @@
 {
-  "active": true,
-  "name": "gocr",
-  "path": "gocr_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 360000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 5335057,
-  "http-resp-headers": [],
-  "http-resp-size": 5335057,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr",
+	"path": "gocr_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 360000,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/applications/speechtotext/spec.json b/runtime/experiments/applications/speechtotext/spec.json
index e20c94f..1489bae 100644
--- a/runtime/experiments/applications/speechtotext/spec.json
+++ b/runtime/experiments/applications/speechtotext/spec.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "hello_ps",
-  "path": "hello_ps_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 102400,
-  "http-resp-headers": [],
-  "http-resp-size": 1048576,
-  "http-resp-content-type": "image/jpeg"
+	"active": true,
+	"name": "hello_ps",
+	"path": "hello_ps_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 102400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "image/jpeg"
 }
diff --git a/runtime/experiments/bimodal/spec.json b/runtime/experiments/bimodal/spec.json
index f40b367..df092fa 100644
--- a/runtime/experiments/bimodal/spec.json
+++ b/runtime/experiments/bimodal/spec.json
@@ -1,32 +1,28 @@
 {
-  "active": true,
-  "name": "fibonacci_10",
-  "path": "fibonacci_wasm.so",
-  "port": 10010,
-  "expected-execution-us": 6000,
-  "admissions-percentile": 70,
-  "relative-deadline-us": 20000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci_10",
+	"path": "fibonacci_wasm.so",
+	"port": 10010,
+	"expected-execution-us": 6000,
+	"admissions-percentile": 70,
+	"relative-deadline-us": 20000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "fibonacci_40",
-  "path": "fibonacci_wasm.so",
-  "port": 10040,
-  "expected-execution-us": 10000000,
-  "admissions-percentile": 70,
-  "relative-deadline-us": 20000000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci_40",
+	"path": "fibonacci_wasm.so",
+	"port": 10040,
+	"expected-execution-us": 10000000,
+	"admissions-percentile": 70,
+	"relative-deadline-us": 20000000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/concurrency/spec.json b/runtime/experiments/concurrency/spec.json
index 140ec1e..02000b7 100644
--- a/runtime/experiments/concurrency/spec.json
+++ b/runtime/experiments/concurrency/spec.json
@@ -7,8 +7,6 @@
 	"admissions-percentile": 70,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "text/plain",
 	"http-req-size": 1024,
 	"http-resp-headers": [],
 	"http-resp-size": 1024,
diff --git a/runtime/experiments/deadline_description/cifar10/template.json b/runtime/experiments/deadline_description/cifar10/template.json
index 0a39df0..be8bd8b 100644
--- a/runtime/experiments/deadline_description/cifar10/template.json
+++ b/runtime/experiments/deadline_description/cifar10/template.json
@@ -1,15 +1,13 @@
 {
-  "active": true,
-  "name": "cifar10",
-  "path": "cifar10_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 5000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/bmp",
-  "http-req-size": 4096,
-  "http-resp-headers": [],
-  "http-resp-size": 128,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "cifar10",
+	"path": "cifar10_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 5000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/deadline_description/ekf/template.json b/runtime/experiments/deadline_description/ekf/template.json
index 01ecbc3..18b4154 100644
--- a/runtime/experiments/deadline_description/ekf/template.json
+++ b/runtime/experiments/deadline_description/ekf/template.json
@@ -6,8 +6,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "application/octet-stream",
 	"http-req-size": 1024000,
 	"http-resp-headers": [],
 	"http-resp-size": 1024000,
diff --git a/runtime/experiments/deadline_description/gocr/template.json b/runtime/experiments/deadline_description/gocr/template.json
index e6afbbf..9c91d14 100644
--- a/runtime/experiments/deadline_description/gocr/template.json
+++ b/runtime/experiments/deadline_description/gocr/template.json
@@ -6,8 +6,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 360000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "text/plain",
 	"http-req-size": 5335057,
 	"http-resp-headers": [],
 	"http-resp-size": 5335057,
diff --git a/runtime/experiments/deadline_description/lpd/template.json b/runtime/experiments/deadline_description/lpd/template.json
index e63b36c..458615a 100644
--- a/runtime/experiments/deadline_description/lpd/template.json
+++ b/runtime/experiments/deadline_description/lpd/template.json
@@ -6,8 +6,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "image/jpeg",
 	"http-req-size": 1002400,
 	"http-resp-headers": [],
 	"http-resp-size": 1048576,
diff --git a/runtime/experiments/deadline_description/resize/template.json b/runtime/experiments/deadline_description/resize/template.json
index b30b78d..1531424 100644
--- a/runtime/experiments/deadline_description/resize/template.json
+++ b/runtime/experiments/deadline_description/resize/template.json
@@ -6,8 +6,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "image/jpeg",
 	"http-req-size": 1524000,
 	"http-resp-headers": [],
 	"http-resp-size": 1524000,
diff --git a/runtime/experiments/deadline_description/spec.json b/runtime/experiments/deadline_description/spec.json
index 6ba8705..98d3dae 100644
--- a/runtime/experiments/deadline_description/spec.json
+++ b/runtime/experiments/deadline_description/spec.json
@@ -6,8 +6,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "application/octet-stream",
 	"http-req-size": 1024000,
 	"http-resp-headers": [],
 	"http-resp-size": 1024000,
@@ -21,8 +19,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "image/jpeg",
 	"http-req-size": 1024000,
 	"http-resp-headers": [],
 	"http-resp-size": 1024000,
@@ -36,8 +32,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "image/jpeg",
 	"http-req-size": 1002400,
 	"http-resp-headers": [],
 	"http-resp-size": 1048576,
@@ -51,8 +45,6 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 360000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "text/plain",
 	"http-req-size": 5335057,
 	"http-resp-headers": [],
 	"http-resp-size": 5335057,
@@ -66,11 +58,8 @@
 	"expected-execution-us": 5000,
 	"relative-deadline-us": 50000,
 	"argsize": 1,
-	"http-req-headers": [],
-	"http-req-content-type": "image/bmp",
 	"http-req-size": 4096,
 	"http-resp-headers": [],
 	"http-resp-size": 128,
 	"http-resp-content-type": "text/plain"
-  }
-  
\ No newline at end of file
+}
diff --git a/runtime/experiments/payload/spec.json b/runtime/experiments/payload/spec.json
index 6262561..d47295e 100644
--- a/runtime/experiments/payload/spec.json
+++ b/runtime/experiments/payload/spec.json
@@ -1,60 +1,52 @@
 {
-  "active": true,
-  "name": "work1k",
-  "path": "work1k_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 400,
-  "relative-deadline-us": 2000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1548,
-  "http-resp-headers": [],
-  "http-resp-size": 1548,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work1k",
+	"path": "work1k_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 400,
+	"relative-deadline-us": 2000,
+	"argsize": 1,
+	"http-req-size": 1548,
+	"http-resp-headers": [],
+	"http-resp-size": 1548,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "work10k",
-  "path": "work10k_wasm.so",
-  "port": 10001,
-  "expected-execution-us": 600,
-  "relative-deadline-us": 2000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 10480,
-  "http-resp-headers": [],
-  "http-resp-size": 10480,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work10k",
+	"path": "work10k_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 600,
+	"relative-deadline-us": 2000,
+	"argsize": 1,
+	"http-req-size": 10480,
+	"http-resp-headers": [],
+	"http-resp-size": 10480,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "work100k",
-  "path": "work100k_wasm.so",
-  "port": 10002,
-  "expected-execution-us": 700,
-  "relative-deadline-us": 2000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 104800,
-  "http-resp-headers": [],
-  "http-resp-size": 104800,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work100k",
+	"path": "work100k_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 700,
+	"relative-deadline-us": 2000,
+	"argsize": 1,
+	"http-req-size": 104800,
+	"http-resp-headers": [],
+	"http-resp-size": 104800,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "work1m",
-  "path": "work1m_wasm.so",
-  "port": 10003,
-  "expected-execution-us": 2000,
-  "relative-deadline-us": 6000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1048776,
-  "http-resp-headers": [],
-  "http-resp-size": 1048776,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work1m",
+	"path": "work1m_wasm.so",
+	"port": 10003,
+	"expected-execution-us": 2000,
+	"relative-deadline-us": 6000,
+	"argsize": 1,
+	"http-req-size": 1048776,
+	"http-resp-headers": [],
+	"http-resp-size": 1048776,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/workload_mix/spec.json b/runtime/experiments/workload_mix/spec.json
index f40b367..df092fa 100644
--- a/runtime/experiments/workload_mix/spec.json
+++ b/runtime/experiments/workload_mix/spec.json
@@ -1,32 +1,28 @@
 {
-  "active": true,
-  "name": "fibonacci_10",
-  "path": "fibonacci_wasm.so",
-  "port": 10010,
-  "expected-execution-us": 6000,
-  "admissions-percentile": 70,
-  "relative-deadline-us": 20000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci_10",
+	"path": "fibonacci_wasm.so",
+	"port": 10010,
+	"expected-execution-us": 6000,
+	"admissions-percentile": 70,
+	"relative-deadline-us": 20000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "fibonacci_40",
-  "path": "fibonacci_wasm.so",
-  "port": 10040,
-  "expected-execution-us": 10000000,
-  "admissions-percentile": 70,
-  "relative-deadline-us": 20000000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci_40",
+	"path": "fibonacci_wasm.so",
+	"port": 10040,
+	"expected-execution-us": 10000000,
+	"admissions-percentile": 70,
+	"relative-deadline-us": 20000000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/experiments/workload_mix_realworld/spec.json b/runtime/experiments/workload_mix_realworld/spec.json
index 662233f..f8c9b9f 100644
--- a/runtime/experiments/workload_mix_realworld/spec.json
+++ b/runtime/experiments/workload_mix_realworld/spec.json
@@ -1,480 +1,420 @@
-  {
-    "active": true,
-    "name": "cifar10_1.5",
-    "path": "cifar10_wasm.so",
-    "port": 10018,
-    "expected-execution-us": 2777,
-    "relative-deadline-us": 4166,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/bmp",
-    "http-req-size": 4096,
-    "http-resp-headers": [],
-    "http-resp-size": 128,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "cifar10_1.6",
-    "path": "cifar10_wasm.so",
-    "port": 10019,
-    "expected-execution-us": 2777,
-    "relative-deadline-us": 4443,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/bmp",
-    "http-req-size": 4096,
-    "http-resp-headers": [],
-    "http-resp-size": 128,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "cifar10_1.7",
-    "path": "cifar10_wasm.so",
-    "port": 10020,
-    "expected-execution-us": 2777,
-    "relative-deadline-us": 4721,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/bmp",
-    "http-req-size": 4096,
-    "http-resp-headers": [],
-    "http-resp-size": 128,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "cifar10_1.8",
-    "path": "cifar10_wasm.so",
-    "port": 10021,
-    "expected-execution-us": 2777,
-    "relative-deadline-us": 4999,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/bmp",
-    "http-req-size": 4096,
-    "http-resp-headers": [],
-    "http-resp-size": 128,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "cifar10_1.9",
-    "path": "cifar10_wasm.so",
-    "port": 10022,
-    "expected-execution-us": 2777,
-    "relative-deadline-us": 5276,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/bmp",
-    "http-req-size": 4096,
-    "http-resp-headers": [],
-    "http-resp-size": 128,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "cifar10_2.0",
-    "path": "cifar10_wasm.so",
-    "port": 10023,
-    "expected-execution-us": 2777,
-    "relative-deadline-us": 5554,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/bmp",
-    "http-req-size": 4096,
-    "http-resp-headers": [],
-    "http-resp-size": 128,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "ekf_1.5",
-    "path": "ekf_wasm.so",
-    "port": 10000,
-    "expected-execution-us": 158,
-    "relative-deadline-us": 237,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "application/octet-stream",
-    "http-req-size": 1024000,
-    "http-resp-headers": [],
-    "http-resp-size": 1024000,
-    "http-resp-content-type": "application/octet-stream",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "ekf_1.6",
-    "path": "ekf_wasm.so",
-    "port": 10001,
-    "expected-execution-us": 158,
-    "relative-deadline-us": 253,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "application/octet-stream",
-    "http-req-size": 1024000,
-    "http-resp-headers": [],
-    "http-resp-size": 1024000,
-    "http-resp-content-type": "application/octet-stream",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "ekf_1.7",
-    "path": "ekf_wasm.so",
-    "port": 10002,
-    "expected-execution-us": 158,
-    "relative-deadline-us": 269,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "application/octet-stream",
-    "http-req-size": 1024000,
-    "http-resp-headers": [],
-    "http-resp-size": 1024000,
-    "http-resp-content-type": "application/octet-stream",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "ekf_1.8",
-    "path": "ekf_wasm.so",
-    "port": 10003,
-    "expected-execution-us": 158,
-    "relative-deadline-us": 284,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "application/octet-stream",
-    "http-req-size": 1024000,
-    "http-resp-headers": [],
-    "http-resp-size": 1024000,
-    "http-resp-content-type": "application/octet-stream",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "ekf_1.9",
-    "path": "ekf_wasm.so",
-    "port": 10004,
-    "expected-execution-us": 158,
-    "relative-deadline-us": 300,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "application/octet-stream",
-    "http-req-size": 1024000,
-    "http-resp-headers": [],
-    "http-resp-size": 1024000,
-    "http-resp-content-type": "application/octet-stream",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "ekf_2.0",
-    "path": "ekf_wasm.so",
-    "port": 10005,
-    "expected-execution-us": 158,
-    "relative-deadline-us": 316,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "application/octet-stream",
-    "http-req-size": 1024000,
-    "http-resp-headers": [],
-    "http-resp-size": 1024000,
-    "http-resp-content-type": "application/octet-stream",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "gocr_1.5",
-    "path": "gocr_wasm.so",
-    "port": 10006,
-    "expected-execution-us": 461831,
-    "relative-deadline-us": 692746,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "text/plain",
-    "http-req-size": 5335057,
-    "http-resp-headers": [],
-    "http-resp-size": 5335057,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "gocr_1.6",
-    "path": "gocr_wasm.so",
-    "port": 10007,
-    "expected-execution-us": 461831,
-    "relative-deadline-us": 738930,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "text/plain",
-    "http-req-size": 5335057,
-    "http-resp-headers": [],
-    "http-resp-size": 5335057,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "gocr_1.7",
-    "path": "gocr_wasm.so",
-    "port": 10008,
-    "expected-execution-us": 461831,
-    "relative-deadline-us": 785113,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "text/plain",
-    "http-req-size": 5335057,
-    "http-resp-headers": [],
-    "http-resp-size": 5335057,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "gocr_1.8",
-    "path": "gocr_wasm.so",
-    "port": 10009,
-    "expected-execution-us": 461831,
-    "relative-deadline-us": 831296,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "text/plain",
-    "http-req-size": 5335057,
-    "http-resp-headers": [],
-    "http-resp-size": 5335057,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "gocr_1.9",
-    "path": "gocr_wasm.so",
-    "port": 10010,
-    "expected-execution-us": 461831,
-    "relative-deadline-us": 877479,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "text/plain",
-    "http-req-size": 5335057,
-    "http-resp-headers": [],
-    "http-resp-size": 5335057,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "gocr_2.0",
-    "path": "gocr_wasm.so",
-    "port": 10011,
-    "expected-execution-us": 461831,
-    "relative-deadline-us": 923662,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "text/plain",
-    "http-req-size": 5335057,
-    "http-resp-headers": [],
-    "http-resp-size": 5335057,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "lpd_1.5",
-    "path": "lpd_wasm.so",
-    "port": 10012,
-    "expected-execution-us": 31597,
-    "relative-deadline-us": 47396,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1002400,
-    "http-resp-headers": [],
-    "http-resp-size": 1048576,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "lpd_1.6",
-    "path": "lpd_wasm.so",
-    "port": 10013,
-    "expected-execution-us": 31597,
-    "relative-deadline-us": 50555,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1002400,
-    "http-resp-headers": [],
-    "http-resp-size": 1048576,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "lpd_1.7",
-    "path": "lpd_wasm.so",
-    "port": 10014,
-    "expected-execution-us": 31597,
-    "relative-deadline-us": 53715,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1002400,
-    "http-resp-headers": [],
-    "http-resp-size": 1048576,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "lpd_1.8",
-    "path": "lpd_wasm.so",
-    "port": 10015,
-    "expected-execution-us": 31597,
-    "relative-deadline-us": 56875,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1002400,
-    "http-resp-headers": [],
-    "http-resp-size": 1048576,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "lpd_1.9",
-    "path": "lpd_wasm.so",
-    "port": 10016,
-    "expected-execution-us": 31597,
-    "relative-deadline-us": 60034,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1002400,
-    "http-resp-headers": [],
-    "http-resp-size": 1048576,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "lpd_2.0",
-    "path": "lpd_wasm.so",
-    "port": 10017,
-    "expected-execution-us": 31597,
-    "relative-deadline-us": 63194,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1002400,
-    "http-resp-headers": [],
-    "http-resp-size": 1048576,
-    "http-resp-content-type": "text/plain",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "resize_1.5",
-    "path": "resize_wasm.so",
-    "port": 10018,
-    "expected-execution-us": 138903,
-    "relative-deadline-us": 208354,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1524000,
-    "http-resp-headers": [],
-    "http-resp-size": 1524000,
-    "http-resp-content-type": "image/png",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "resize_1.6",
-    "path": "resize_wasm.so",
-    "port": 10019,
-    "expected-execution-us": 138903,
-    "relative-deadline-us": 222245,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1524000,
-    "http-resp-headers": [],
-    "http-resp-size": 1524000,
-    "http-resp-content-type": "image/png",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "resize_1.7",
-    "path": "resize_wasm.so",
-    "port": 10020,
-    "expected-execution-us": 138903,
-    "relative-deadline-us": 236135,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1524000,
-    "http-resp-headers": [],
-    "http-resp-size": 1524000,
-    "http-resp-content-type": "image/png",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "resize_1.8",
-    "path": "resize_wasm.so",
-    "port": 10021,
-    "expected-execution-us": 138903,
-    "relative-deadline-us": 250025,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1524000,
-    "http-resp-headers": [],
-    "http-resp-size": 1524000,
-    "http-resp-content-type": "image/png",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "resize_1.9",
-    "path": "resize_wasm.so",
-    "port": 10022,
-    "expected-execution-us": 138903,
-    "relative-deadline-us": 263916,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1524000,
-    "http-resp-headers": [],
-    "http-resp-size": 1524000,
-    "http-resp-content-type": "image/png",
-    "admissions-percentile": 90
-  },
-  {
-    "active": true,
-    "name": "resize_2.0",
-    "path": "resize_wasm.so",
-    "port": 10023,
-    "expected-execution-us": 138903,
-    "relative-deadline-us": 277806,
-    "argsize": 1,
-    "http-req-headers": [],
-    "http-req-content-type": "image/jpeg",
-    "http-req-size": 1524000,
-    "http-resp-headers": [],
-    "http-resp-size": 1524000,
-    "http-resp-content-type": "image/png",
-    "admissions-percentile": 90
-  }
+{
+	"active": true,
+	"name": "cifar10_1.5",
+	"path": "cifar10_wasm.so",
+	"port": 10018,
+	"expected-execution-us": 2777,
+	"relative-deadline-us": 4166,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "cifar10_1.6",
+	"path": "cifar10_wasm.so",
+	"port": 10019,
+	"expected-execution-us": 2777,
+	"relative-deadline-us": 4443,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "cifar10_1.7",
+	"path": "cifar10_wasm.so",
+	"port": 10020,
+	"expected-execution-us": 2777,
+	"relative-deadline-us": 4721,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "cifar10_1.8",
+	"path": "cifar10_wasm.so",
+	"port": 10021,
+	"expected-execution-us": 2777,
+	"relative-deadline-us": 4999,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "cifar10_1.9",
+	"path": "cifar10_wasm.so",
+	"port": 10022,
+	"expected-execution-us": 2777,
+	"relative-deadline-us": 5276,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "cifar10_2.0",
+	"path": "cifar10_wasm.so",
+	"port": 10023,
+	"expected-execution-us": 2777,
+	"relative-deadline-us": 5554,
+	"argsize": 1,
+	"http-req-size": 4096,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "ekf_1.5",
+	"path": "ekf_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 158,
+	"relative-deadline-us": 237,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "ekf_1.6",
+	"path": "ekf_wasm.so",
+	"port": 10001,
+	"expected-execution-us": 158,
+	"relative-deadline-us": 253,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "ekf_1.7",
+	"path": "ekf_wasm.so",
+	"port": 10002,
+	"expected-execution-us": 158,
+	"relative-deadline-us": 269,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "ekf_1.8",
+	"path": "ekf_wasm.so",
+	"port": 10003,
+	"expected-execution-us": 158,
+	"relative-deadline-us": 284,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "ekf_1.9",
+	"path": "ekf_wasm.so",
+	"port": 10004,
+	"expected-execution-us": 158,
+	"relative-deadline-us": 300,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "ekf_2.0",
+	"path": "ekf_wasm.so",
+	"port": 10005,
+	"expected-execution-us": 158,
+	"relative-deadline-us": 316,
+	"argsize": 1,
+	"http-req-size": 1024000,
+	"http-resp-headers": [],
+	"http-resp-size": 1024000,
+	"http-resp-content-type": "application/octet-stream",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "gocr_1.5",
+	"path": "gocr_wasm.so",
+	"port": 10006,
+	"expected-execution-us": 461831,
+	"relative-deadline-us": 692746,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "gocr_1.6",
+	"path": "gocr_wasm.so",
+	"port": 10007,
+	"expected-execution-us": 461831,
+	"relative-deadline-us": 738930,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "gocr_1.7",
+	"path": "gocr_wasm.so",
+	"port": 10008,
+	"expected-execution-us": 461831,
+	"relative-deadline-us": 785113,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "gocr_1.8",
+	"path": "gocr_wasm.so",
+	"port": 10009,
+	"expected-execution-us": 461831,
+	"relative-deadline-us": 831296,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "gocr_1.9",
+	"path": "gocr_wasm.so",
+	"port": 10010,
+	"expected-execution-us": 461831,
+	"relative-deadline-us": 877479,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "gocr_2.0",
+	"path": "gocr_wasm.so",
+	"port": 10011,
+	"expected-execution-us": 461831,
+	"relative-deadline-us": 923662,
+	"argsize": 1,
+	"http-req-size": 5335057,
+	"http-resp-headers": [],
+	"http-resp-size": 5335057,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "lpd_1.5",
+	"path": "lpd_wasm.so",
+	"port": 10012,
+	"expected-execution-us": 31597,
+	"relative-deadline-us": 47396,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "lpd_1.6",
+	"path": "lpd_wasm.so",
+	"port": 10013,
+	"expected-execution-us": 31597,
+	"relative-deadline-us": 50555,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "lpd_1.7",
+	"path": "lpd_wasm.so",
+	"port": 10014,
+	"expected-execution-us": 31597,
+	"relative-deadline-us": 53715,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "lpd_1.8",
+	"path": "lpd_wasm.so",
+	"port": 10015,
+	"expected-execution-us": 31597,
+	"relative-deadline-us": 56875,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "lpd_1.9",
+	"path": "lpd_wasm.so",
+	"port": 10016,
+	"expected-execution-us": 31597,
+	"relative-deadline-us": 60034,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "lpd_2.0",
+	"path": "lpd_wasm.so",
+	"port": 10017,
+	"expected-execution-us": 31597,
+	"relative-deadline-us": 63194,
+	"argsize": 1,
+	"http-req-size": 1002400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "text/plain",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "resize_1.5",
+	"path": "resize_wasm.so",
+	"port": 10018,
+	"expected-execution-us": 138903,
+	"relative-deadline-us": 208354,
+	"argsize": 1,
+	"http-req-size": 1524000,
+	"http-resp-headers": [],
+	"http-resp-size": 1524000,
+	"http-resp-content-type": "image/png",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "resize_1.6",
+	"path": "resize_wasm.so",
+	"port": 10019,
+	"expected-execution-us": 138903,
+	"relative-deadline-us": 222245,
+	"argsize": 1,
+	"http-req-size": 1524000,
+	"http-resp-headers": [],
+	"http-resp-size": 1524000,
+	"http-resp-content-type": "image/png",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "resize_1.7",
+	"path": "resize_wasm.so",
+	"port": 10020,
+	"expected-execution-us": 138903,
+	"relative-deadline-us": 236135,
+	"argsize": 1,
+	"http-req-size": 1524000,
+	"http-resp-headers": [],
+	"http-resp-size": 1524000,
+	"http-resp-content-type": "image/png",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "resize_1.8",
+	"path": "resize_wasm.so",
+	"port": 10021,
+	"expected-execution-us": 138903,
+	"relative-deadline-us": 250025,
+	"argsize": 1,
+	"http-req-size": 1524000,
+	"http-resp-headers": [],
+	"http-resp-size": 1524000,
+	"http-resp-content-type": "image/png",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "resize_1.9",
+	"path": "resize_wasm.so",
+	"port": 10022,
+	"expected-execution-us": 138903,
+	"relative-deadline-us": 263916,
+	"argsize": 1,
+	"http-req-size": 1524000,
+	"http-resp-headers": [],
+	"http-resp-size": 1524000,
+	"http-resp-content-type": "image/png",
+	"admissions-percentile": 90
+},
+{
+	"active": true,
+	"name": "resize_2.0",
+	"path": "resize_wasm.so",
+	"port": 10023,
+	"expected-execution-us": 138903,
+	"relative-deadline-us": 277806,
+	"argsize": 1,
+	"http-req-size": 1524000,
+	"http-resp-headers": [],
+	"http-resp-size": 1524000,
+	"http-resp-content-type": "image/png",
+	"admissions-percentile": 90
+}
diff --git a/runtime/include/module.h b/runtime/include/module.h
index a08a560..ff003d0 100644
--- a/runtime/include/module.h
+++ b/runtime/include/module.h
@@ -57,9 +57,6 @@ struct module {
 
 	/* HTTP State */
 	unsigned long      max_request_or_response_size; /* largest of max_request_size or max_response_size */
-	char               request_headers[HTTP_MAX_HEADER_COUNT][HTTP_MAX_HEADER_LENGTH];
-	int                request_header_count;
-	char               request_content_type[HTTP_MAX_HEADER_VALUE_LENGTH];
 	char               response_content_type[HTTP_MAX_HEADER_VALUE_LENGTH];
 	char               response_headers[HTTP_MAX_HEADER_COUNT][HTTP_MAX_HEADER_LENGTH];
 	int                response_header_count;
diff --git a/runtime/src/module.c b/runtime/src/module.c
index 70a6cec..efca41f 100644
--- a/runtime/src/module.c
+++ b/runtime/src/module.c
@@ -90,20 +90,15 @@ err:
  * Sets the HTTP Request and Response Headers and Content type on a module
  * @param module
  * @param request_count
- * @param request_headers
- * @param request_content_type
  * @param response_count
  * @param response_headers
  * @param response_content_type
  */
 static inline void
-module_set_http_info(struct module *module, int request_count, char *request_headers, char request_content_type[],
-                     int response_count, char *response_headers, char response_content_type[])
+module_set_http_info(struct module *module, int response_count,
+                     char *response_headers, char response_content_type[])
 {
 	assert(module);
-	module->request_header_count = request_count;
-	memcpy(module->request_headers, request_headers, HTTP_MAX_HEADER_LENGTH * HTTP_MAX_HEADER_COUNT);
-	strcpy(module->request_content_type, request_content_type);
 	module->response_header_count = response_count;
 	memcpy(module->response_headers, response_headers, HTTP_MAX_HEADER_LENGTH * HTTP_MAX_HEADER_COUNT);
 	strcpy(module->response_content_type, response_content_type);
@@ -372,7 +367,6 @@ module_new_from_json(char *file_name)
 	}
 
 	int   module_count    = 0;
-	char *request_headers = NULL;
 	char *reponse_headers = NULL;
 	for (int i = 0; i < total_tokens; i++) {
 		assert(tokens[i].type == JSMN_OBJECT);
@@ -381,12 +375,6 @@ module_new_from_json(char *file_name)
 		char module_path[MODULE_MAX_PATH_LENGTH] = { 0 };
 
 		errno           = 0;
-		request_headers = (char *)malloc(HTTP_MAX_HEADER_LENGTH * HTTP_MAX_HEADER_COUNT);
-		if (request_headers == NULL) {
-			fprintf(stderr, "Attempt to allocate request headers failed: %s\n", strerror(errno));
-			goto request_headers_alloc_err;
-		}
-		memset(request_headers, 0, HTTP_MAX_HEADER_LENGTH * HTTP_MAX_HEADER_COUNT);
 
 		errno           = 0;
 		reponse_headers = (char *)malloc(HTTP_MAX_HEADER_LENGTH * HTTP_MAX_HEADER_COUNT);
@@ -408,7 +396,6 @@ module_new_from_json(char *file_name)
 		int32_t  response_count                                      = 0;
 		int      j                                                   = 1;
 		int      ntoks                                               = 2 * tokens[i].size;
-		char     request_content_type[HTTP_MAX_HEADER_VALUE_LENGTH]  = { 0 };
 		char     response_content_type[HTTP_MAX_HEADER_VALUE_LENGTH] = { 0 };
 
 		for (; j < ntoks;) {
@@ -469,19 +456,6 @@ module_new_from_json(char *file_name)
 				if (buffer > 99 || buffer < 50)
 					panic("admissions-percentile must be > 50 and <= 99 but was %d\n", buffer);
 				admissions_percentile = (int)buffer;
-			} else if (strcmp(key, "http-req-headers") == 0) {
-				assert(tokens[i + j + 1].type == JSMN_ARRAY);
-				assert(tokens[i + j + 1].size <= HTTP_MAX_HEADER_COUNT);
-
-				request_count = tokens[i + j + 1].size;
-				ntks += request_count;
-				ntoks += request_count;
-				for (int k = 1; k <= tokens[i + j + 1].size; k++) {
-					jsmntok_t *g = &tokens[i + j + k + 1];
-					char *     r = request_headers + ((k - 1) * HTTP_MAX_HEADER_LENGTH);
-					assert(g->end - g->start < HTTP_MAX_HEADER_LENGTH);
-					strncpy(r, file_buffer + g->start, g->end - g->start);
-				}
 			} else if (strcmp(key, "http-resp-headers") == 0) {
 				assert(tokens[i + j + 1].type == JSMN_ARRAY);
 				assert(tokens[i + j + 1].size <= HTTP_MAX_HEADER_COUNT);
@@ -507,9 +481,6 @@ module_new_from_json(char *file_name)
 					panic("http-resp-size must be between 0 and %ld, was %ld\n",
 					      (int64_t)RUNTIME_HTTP_REQUEST_SIZE_MAX, buffer);
 				response_size = (int32_t)buffer;
-			} else if (strcmp(key, "http-req-content-type") == 0) {
-				if (strlen(val) == 0) panic("http-req-content-type was unexpectedly an empty string");
-				strcpy(request_content_type, val);
 			} else if (strcmp(key, "http-resp-content-type") == 0) {
 				if (strlen(val) == 0) panic("http-resp-content-type was unexpectedly an empty string");
 				strcpy(response_content_type, val);
@@ -536,7 +507,8 @@ module_new_from_json(char *file_name)
 		/* If the ratio is too big, admissions control is too coarse */
 		uint32_t ratio = relative_deadline_us / expected_execution_us;
 		if (ratio > ADMISSIONS_CONTROL_GRANULARITY)
-			panic("Ratio of Deadline to Execution time cannot exceed admissions control granularity of "
+			panic("Ratio of Deadline to Execution time cannot exceed admissions control "
+			      "granularity of "
 			      "%d\n",
 			      ADMISSIONS_CONTROL_GRANULARITY);
 #else
@@ -546,8 +518,6 @@ module_new_from_json(char *file_name)
 #endif
 
 		/* argsize defaults to 0 if absent */
-		/* http-req-headers defaults to empty if absent */
-		/* http-req-headers defaults to empty if absent */
 
 		if (is_active) {
 			/* Allocate a module based on the values from the JSON */
@@ -557,12 +527,11 @@ module_new_from_json(char *file_name)
 			if (module == NULL) goto module_new_err;
 
 			assert(module);
-			module_set_http_info(module, request_count, request_headers, request_content_type,
-			                     response_count, reponse_headers, response_content_type);
+			module_set_http_info(module, response_count, reponse_headers,
+			                     response_content_type);
 			module_count++;
 		}
 
-		free(request_headers);
 		free(reponse_headers);
 	}
 
@@ -578,8 +547,6 @@ done:
 	return return_code;
 module_new_err:
 response_headers_alloc_err:
-	free(request_headers);
-request_headers_alloc_err:
 json_parse_err:
 fclose_err:
 	/* We will retry fclose when we fall through into stat_buffer_alloc_err */
diff --git a/runtime/tests/preemption/test_fibonacci.json b/runtime/tests/preemption/test_fibonacci.json
index 3dfa482..cc8a4d9 100644
--- a/runtime/tests/preemption/test_fibonacci.json
+++ b/runtime/tests/preemption/test_fibonacci.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "fibonacci",
-  "path": "fibonacci_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci",
+	"path": "fibonacci_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/preemption/test_fibonacci_multiple.json b/runtime/tests/preemption/test_fibonacci_multiple.json
index c1b02c3..96027ff 100644
--- a/runtime/tests/preemption/test_fibonacci_multiple.json
+++ b/runtime/tests/preemption/test_fibonacci_multiple.json
@@ -1,28 +1,24 @@
 {
-  "active": true,
-  "name": "fibonacci",
-  "path": "fibonacci_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 80000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci",
+	"path": "fibonacci_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 80000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 },
 {
-  "active": true,
-  "name": "fibonacci2",
-  "path": "fibonacci_wasm.so",
-  "port": 10001,
-  "relative-deadline-us": 20000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci2",
+	"path": "fibonacci_wasm.so",
+	"port": 10001,
+	"relative-deadline-us": 20000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_armcifar10.json b/runtime/tests/test_armcifar10.json
index 32ef760..a60fc1f 100644
--- a/runtime/tests/test_armcifar10.json
+++ b/runtime/tests/test_armcifar10.json
@@ -5,8 +5,6 @@
   "port": 10000,
   "relative-deadline-us": 50000,
   "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/png",
   "http-req-size": 4096,
   "http-resp-headers": [],
   "http-resp-size": 128,
diff --git a/runtime/tests/test_empty.json b/runtime/tests/test_empty.json
index 6128ca1..62a29b9 100644
--- a/runtime/tests/test_empty.json
+++ b/runtime/tests/test_empty.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "empty",
-  "path": "empty_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "empty",
+	"path": "empty_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_fibonacci.json b/runtime/tests/test_fibonacci.json
index 146ea9c..65c400c 100644
--- a/runtime/tests/test_fibonacci.json
+++ b/runtime/tests/test_fibonacci.json
@@ -1,15 +1,13 @@
 {
-  "active": true,
-  "name": "fibonacci",
-  "path": "fibonacci_wasm.so",
-  "port": 10000,
-  "expected-execution-us": 600,
-  "relative-deadline-us": 2000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1024,
-  "http-resp-headers": [],
-  "http-resp-size": 1024,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "fibonacci",
+	"path": "fibonacci_wasm.so",
+	"port": 10000,
+	"expected-execution-us": 600,
+	"relative-deadline-us": 2000,
+	"argsize": 1,
+	"http-req-size": 1024,
+	"http-resp-headers": [],
+	"http-resp-size": 1024,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_gocr.json b/runtime/tests/test_gocr.json
index a9632d5..fa66588 100644
--- a/runtime/tests/test_gocr.json
+++ b/runtime/tests/test_gocr.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "gocr",
-  "path": "gocr_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/png",
-  "http-req-size": 10240,
-  "http-resp-headers": [],
-  "http-resp-size": 128,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "gocr",
+	"path": "gocr_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 10240,
+	"http-resp-headers": [],
+	"http-resp-size": 128,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_sodlpd.json b/runtime/tests/test_sodlpd.json
index 478d9a1..4d87889 100644
--- a/runtime/tests/test_sodlpd.json
+++ b/runtime/tests/test_sodlpd.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "lpd",
-  "path": "lpd_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 102400,
-  "http-resp-headers": [],
-  "http-resp-size": 1048576,
-  "http-resp-content-type": "image/jpeg"
+	"active": true,
+	"name": "lpd",
+	"path": "lpd_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 102400,
+	"http-resp-headers": [],
+	"http-resp-size": 1048576,
+	"http-resp-content-type": "image/jpeg"
 }
diff --git a/runtime/tests/test_sodresize.json b/runtime/tests/test_sodresize.json
index 99d11ed..79bb6ba 100644
--- a/runtime/tests/test_sodresize.json
+++ b/runtime/tests/test_sodresize.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "resize",
-  "path": "resize_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "image/jpeg",
-  "http-req-size": 102400,
-  "http-resp-headers": [],
-  "http-resp-size": 102400,
-  "http-resp-content-type": "image/png"
+	"active": true,
+	"name": "resize",
+	"path": "resize_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 102400,
+	"http-resp-headers": [],
+	"http-resp-size": 102400,
+	"http-resp-content-type": "image/png"
 }
diff --git a/runtime/tests/test_work.json b/runtime/tests/test_work.json
index 92d2807..b3f2577 100644
--- a/runtime/tests/test_work.json
+++ b/runtime/tests/test_work.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "work",
-  "path": "work_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1048776,
-  "http-resp-headers": [],
-  "http-resp-size": 1048776,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work",
+	"path": "work_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1048776,
+	"http-resp-headers": [],
+	"http-resp-size": 1048776,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_work100k.json b/runtime/tests/test_work100k.json
index aadae1d..68b4b41 100644
--- a/runtime/tests/test_work100k.json
+++ b/runtime/tests/test_work100k.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "work100k",
-  "path": "work100k_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 102600,
-  "http-resp-headers": [],
-  "http-resp-size": 102600,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work100k",
+	"path": "work100k_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 102600,
+	"http-resp-headers": [],
+	"http-resp-size": 102600,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_work10k.json b/runtime/tests/test_work10k.json
index a46ba7c..f6d1a64 100644
--- a/runtime/tests/test_work10k.json
+++ b/runtime/tests/test_work10k.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "work10k",
-  "path": "work10k_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 10480,
-  "http-resp-headers": [],
-  "http-resp-size": 10480,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work10k",
+	"path": "work10k_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 10480,
+	"http-resp-headers": [],
+	"http-resp-size": 10480,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_work1k.json b/runtime/tests/test_work1k.json
index bdf1c20..8612a34 100644
--- a/runtime/tests/test_work1k.json
+++ b/runtime/tests/test_work1k.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "work1k",
-  "path": "work1k_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1200,
-  "http-resp-headers": [],
-  "http-resp-size": 1200,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work1k",
+	"path": "work1k_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1200,
+	"http-resp-headers": [],
+	"http-resp-size": 1200,
+	"http-resp-content-type": "text/plain"
 }
diff --git a/runtime/tests/test_work1m.json b/runtime/tests/test_work1m.json
index 9caed19..65e2992 100644
--- a/runtime/tests/test_work1m.json
+++ b/runtime/tests/test_work1m.json
@@ -1,14 +1,12 @@
 {
-  "active": true,
-  "name": "work1m",
-  "path": "work1m_wasm.so",
-  "port": 10000,
-  "relative-deadline-us": 50000,
-  "argsize": 1,
-  "http-req-headers": [],
-  "http-req-content-type": "text/plain",
-  "http-req-size": 1048776,
-  "http-resp-headers": [],
-  "http-resp-size": 1048776,
-  "http-resp-content-type": "text/plain"
+	"active": true,
+	"name": "work1m",
+	"path": "work1m_wasm.so",
+	"port": 10000,
+	"relative-deadline-us": 50000,
+	"argsize": 1,
+	"http-req-size": 1048776,
+	"http-resp-headers": [],
+	"http-resp-size": 1048776,
+	"http-resp-content-type": "text/plain"
 }