diff --git a/server/cors_middleware.go b/server/cors_middleware.go
deleted file mode 100644
index 23ed53d..0000000
--- a/server/cors_middleware.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import "net/http"
-
-func corsMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Methods", "POST, PUT, DELETE, OPTIONS")
-		w.Header().Set("Access-Control-Allow-Headers", "*")
-		w.Header().Set("Access-Control-Allow-Origin", r.Header.Get("origin"))
-		w.Header().Set("Access-Control-Allow-Credentials", "true")
-		w.Header().Set("Access-Control-Expose-Headers", "*")
-
-		if r.Method == "OPTIONS" {
-			w.WriteHeader(http.StatusNoContent)
-			return
-		}
-
-		// Call the next handler, which can be another middleware in the chain, or the final handler.
-		next.ServeHTTP(w, r)
-	})
-}
diff --git a/server/main.go b/server/main.go
index e1afb83..592ab8b 100644
--- a/server/main.go
+++ b/server/main.go
@@ -13,9 +13,7 @@ import (
 	mfa "github.com/silinternational/serverless-mfa-api-go"
 )
 
-var (
-	envConfig mfa.EnvConfig
-)
+var envConfig mfa.EnvConfig
 
 func main() {
 	log.SetOutput(os.Stdout)
@@ -31,7 +29,7 @@ func main() {
 	// ListenAndServe starts an HTTP server with a given address and
 	// handler defined in NewRouter.
 	log.Println("Starting service on port 8080")
-	router := newRouter([]mux.MiddlewareFunc{corsMiddleware})
+	router := newRouter()
 	log.Fatal(http.ListenAndServe(":8080", router))
 }
 
@@ -88,15 +86,10 @@ var routes = []route{
 }
 
 // newRouter forms a new mux router, see https://github.com/gorilla/mux.
-func newRouter(mws []mux.MiddlewareFunc) *mux.Router {
+func newRouter() *mux.Router {
 	// Create a basic router.
 	router := mux.NewRouter().StrictSlash(true)
 
-	// attach any extra middleware
-	for _, mw := range mws {
-		router.Use(mw)
-	}
-
 	// authenticate request based on api key and secret in headers
 	// also adds user to context
 	router.Use(authenticationMiddleware)
diff --git a/u2fserver/main.go b/u2fserver/main.go
index ab1e693..8f1d48b 100644
--- a/u2fserver/main.go
+++ b/u2fserver/main.go
@@ -12,9 +12,7 @@ import (
 	u2fsim "github.com/silinternational/serverless-mfa-api-go/u2fsimulator"
 )
 
-var (
-	envConfig mfa.EnvConfig
-)
+var envConfig mfa.EnvConfig
 
 func main() {
 	log.SetOutput(os.Stdout)
@@ -23,7 +21,7 @@ func main() {
 	// ListenAndServe starts an HTTP server with a given address and
 	// handler defined in NewRouter.
 	log.Println("Starting service on port 8080")
-	router := newRouter(nil)
+	router := newRouter()
 	log.Fatal(http.ListenAndServe(":8080", router))
 }
 
@@ -47,7 +45,7 @@ var routes = []route{
 }
 
 // newRouter forms a new mux router, see https://github.com/gorilla/mux.
-func newRouter(mws []mux.MiddlewareFunc) *mux.Router {
+func newRouter() *mux.Router {
 	// Create a basic router.
 	router := mux.NewRouter().StrictSlash(true)