diff --git a/gateway/handlers/create_handler.go b/gateway/handlers/create_handler.go
index 6e1236e58a7e4efdc03b54e80fb66e9473248eb2..31385da5b8437268318a38f3a5b42635825fb957 100644
--- a/gateway/handlers/create_handler.go
+++ b/gateway/handlers/create_handler.go
@@ -82,12 +82,6 @@ func makeSpec(request *requests.CreateFunctionRequest, maxRestarts uint64, resta
 	} else {
 		constraints = linuxOnlyConstraints
 	}
-	labels := map[string]string{"function": "true"}
-	if request.Labels != nil {
-		for k, v := range request.Labels {
-			labels[k] = v
-		}
-	}
 
 	labels := map[string]string{
 		"com.openfaas.function": request.Service,
@@ -135,10 +129,6 @@ func makeSpec(request *requests.CreateFunctionRequest, maxRestarts uint64, resta
 				Replicas: getMinReplicas(request),
 			},
 		},
-		Annotations: swarm.Annotations{
-			Name:   request.Service,
-			Labels: labels,
-		},
 	}
 
 	// TODO: request.EnvProcess should only be set if it's not nil, otherwise we override anything in the Docker image already
diff --git a/gateway/requests/requests.go b/gateway/requests/requests.go
index fc763db80a0422cc1d1b0d56b540c18b32cbd485..979651be101d7d2af59a98b199a1e1e84f71b1c5 100644
--- a/gateway/requests/requests.go
+++ b/gateway/requests/requests.go
@@ -21,9 +21,6 @@ type CreateFunctionRequest struct {
 	// EnvVars provides overrides for functions.
 	EnvVars map[string]string `json:"envVars"`
 
-	// Secrets is a list of secrets required for the orchestration layer to provide
-	Secrets []string `json:"secrets"`
-
 	// RegistryAuth is the registry authentication (optional)
 	// in the same encoded format as Docker native credentials
 	// (see ~/.docker/config.json)