diff --git a/internal/server/control/control.go b/internal/server/control/control.go
index d948e86..072a9ce 100644
--- a/internal/server/control/control.go
+++ b/internal/server/control/control.go
@@ -2,7 +2,6 @@ package control
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -30,11 +29,14 @@ func Run(bindAddr string) {
 // user.Routes.Remove() []model.Route
 var funcRemove func(id string) error
 
-func removeRoute(http.ResponseWriter, *http.Request) {
-
-	if err := funcRemove(""); err != nil {
-		fmt.Printf("Mostoles, we've had a problem")
+func removeRoute(res http.ResponseWriter, req *http.Request) {
+	vars := mux.Vars(req)
+	id, _ := vars["id"]
+	if err := funcRemove(id); err != nil {
+		res.WriteHeader(http.StatusNotFound)
+		return
 	}
+	res.WriteHeader(http.StatusNoContent)
 }
 
 // user.Routes.List() []model.Route
diff --git a/internal/server/control/control_test.go b/internal/server/control/control_test.go
index 298348b..e1cadeb 100644
--- a/internal/server/control/control_test.go
+++ b/internal/server/control/control_test.go
@@ -81,7 +81,7 @@ func TestAddRouteReturnsCreated(t *testing.T) {
 
 	respJson := model.Route{}
 	if err := json.Unmarshal(resp.Body.Bytes(), &respJson); err == nil {
-		t.Errorf("Invalid JSON response. %s", resp.Body.String()) //FIXME: String comparsion not working
+		t.Errorf("Invalid JSON response. %s", resp.Body.String()) //FIXME: String comparsion not working, comparing against itself?
 	}
 
 	expectedRouteSpec := model.Route{Method: "GET", Pattern: "/hello", Entrypoint: "/bin/sh -c", Command: "echo Hello World | kapow set /response/body", Index: 0, ID: "ROUTE_XXXXXXXXXXXXXXXXXX"}
@@ -92,7 +92,6 @@ func TestAddRouteReturnsCreated(t *testing.T) {
 
 func TestRemoveRouteReturnsNotFound(t *testing.T) {
 	t.Skip("****** WIP ******")
-
 	req := httptest.NewRequest(http.MethodDelete, "/routes/ROUTE_XXXXXXXXXXXXXXXXXX", nil)
 	resp := httptest.NewRecorder()
 	handler := http.HandlerFunc(removeRoute)
@@ -112,8 +111,6 @@ func TestRemoveRouteReturnsNotFound(t *testing.T) {
 }
 
 func TestRemoveRouteReturnsNoContent(t *testing.T) {
-	t.Skip("****** WIP ******")
-
 	req := httptest.NewRequest(http.MethodDelete, "/routes/ROUTE_XXXXXXXXXXXXXXXXXX", nil)
 	resp := httptest.NewRecorder()
 	handler := http.HandlerFunc(removeRoute)