diff --git a/gateway/server.go b/gateway/server.go
index d214abca..9c0d166b 100644
--- a/gateway/server.go
+++ b/gateway/server.go
@@ -115,8 +115,6 @@ func main() {
 
 	r.PathPrefix("/ui/").Handler(http.StripPrefix("/ui", fsCORS)).Methods(http.MethodGet)
 
-	r.HandleFunc("/", faasHandlers.RoutelessProxy).Methods(http.MethodPost)
-
 	metricsHandler := metrics.PrometheusHandler()
 	r.Handle("/metrics", metricsHandler)
 	r.Handle("/", http.RedirectHandler("/ui/", http.StatusMovedPermanently)).Methods(http.MethodGet)
diff --git a/gateway/tests/integration/routes_test.go b/gateway/tests/integration/routes_test.go
index 21d775cc..5263f0fd 100644
--- a/gateway/tests/integration/routes_test.go
+++ b/gateway/tests/integration/routes_test.go
@@ -100,23 +100,23 @@ func TestEchoIt_Post_Route_Handler(t *testing.T) {
 	}
 }
 
-func TestEchoIt_Post_X_Header_Routing_Handler(t *testing.T) {
-	reqBody := "test message"
-	headers := make(map[string]string, 0)
-	headers["X-Function"] = "func_echoit"
+// Test suppressed due to X-Header deprecation.
+// func TestEchoIt_Post_X_Header_Routing_Handler(t *testing.T) {
+// 	reqBody := "test message"
+// 	headers := make(map[string]string, 0)
+// 	headers["X-Function"] = "func_echoit"
 
-	body, code, err := fireRequestWithHeaders("http://localhost:8080/", http.MethodPost, reqBody, headers)
+// 	body, code, err := fireRequestWithHeaders("http://localhost:8080/", http.MethodPost, reqBody, headers)
 
-	if err != nil {
-		t.Log(err)
-		t.Fail()
-	}
-	if code != http.StatusOK {
-		t.Log("Failed")
-	}
-	if body != reqBody {
-		t.Log("Expected body returned")
-		t.Fail()
-	}
-
-}
+// 	if err != nil {
+// 		t.Log(err)
+// 		t.Fail()
+// 	}
+// 	if code != http.StatusOK {
+// 		t.Logf("statusCode - want: %d, got: %d", http.StatusOK, code)
+// 	}
+// 	if body != reqBody {
+// 		t.Logf("Expected body from echo function to be equal to input, but was: %s", body)
+// 		t.Fail()
+// 	}
+// }