diff --git a/server/api_account.go b/server/api_account.go
index 6d3d9783..a98d4565 100644
--- a/server/api_account.go
+++ b/server/api_account.go
@@ -105,16 +105,6 @@ func (c *AccountAPIController) AccountBalance(w http.ResponseWriter, r *http.Req
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *AccountAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // AccountCoins - Get an Account's Unspent Coins
 func (c *AccountAPIController) AccountCoins(w http.ResponseWriter, r *http.Request) {
 	accountCoinsRequest := &types.AccountCoinsRequest{}
diff --git a/server/api_block.go b/server/api_block.go
index 9321db45..a3d22732 100644
--- a/server/api_block.go
+++ b/server/api_block.go
@@ -105,16 +105,6 @@ func (c *BlockAPIController) Block(w http.ResponseWriter, r *http.Request) {
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *BlockAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // BlockTransaction - Get a Block Transaction
 func (c *BlockAPIController) BlockTransaction(w http.ResponseWriter, r *http.Request) {
 	blockTransactionRequest := &types.BlockTransactionRequest{}
diff --git a/server/api_construction.go b/server/api_construction.go
index a071bdc8..f1d91c2a 100644
--- a/server/api_construction.go
+++ b/server/api_construction.go
@@ -144,16 +144,6 @@ func (c *ConstructionAPIController) ConstructionCombine(w http.ResponseWriter, r
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *ConstructionAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // ConstructionDerive - Derive an AccountIdentifier from a PublicKey
 func (c *ConstructionAPIController) ConstructionDerive(w http.ResponseWriter, r *http.Request) {
 	constructionDeriveRequest := &types.ConstructionDeriveRequest{}
@@ -187,16 +177,6 @@ func (c *ConstructionAPIController) ConstructionDerive(w http.ResponseWriter, r
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *ConstructionAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // ConstructionHash - Get the Hash of a Signed Transaction
 func (c *ConstructionAPIController) ConstructionHash(w http.ResponseWriter, r *http.Request) {
 	constructionHashRequest := &types.ConstructionHashRequest{}
@@ -230,16 +210,6 @@ func (c *ConstructionAPIController) ConstructionHash(w http.ResponseWriter, r *h
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *ConstructionAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // ConstructionMetadata - Get Metadata for Transaction Construction
 func (c *ConstructionAPIController) ConstructionMetadata(w http.ResponseWriter, r *http.Request) {
 	constructionMetadataRequest := &types.ConstructionMetadataRequest{}
@@ -273,16 +243,6 @@ func (c *ConstructionAPIController) ConstructionMetadata(w http.ResponseWriter,
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *ConstructionAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // ConstructionParse - Parse a Transaction
 func (c *ConstructionAPIController) ConstructionParse(w http.ResponseWriter, r *http.Request) {
 	constructionParseRequest := &types.ConstructionParseRequest{}
@@ -316,16 +276,6 @@ func (c *ConstructionAPIController) ConstructionParse(w http.ResponseWriter, r *
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *ConstructionAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // ConstructionPayloads - Generate an Unsigned Transaction and Signing Payloads
 func (c *ConstructionAPIController) ConstructionPayloads(w http.ResponseWriter, r *http.Request) {
 	constructionPayloadsRequest := &types.ConstructionPayloadsRequest{}
@@ -359,16 +309,6 @@ func (c *ConstructionAPIController) ConstructionPayloads(w http.ResponseWriter,
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *ConstructionAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // ConstructionPreprocess - Create a Request to Fetch Metadata
 func (c *ConstructionAPIController) ConstructionPreprocess(w http.ResponseWriter, r *http.Request) {
 	constructionPreprocessRequest := &types.ConstructionPreprocessRequest{}
@@ -402,16 +342,6 @@ func (c *ConstructionAPIController) ConstructionPreprocess(w http.ResponseWriter
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *ConstructionAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // ConstructionSubmit - Submit a Signed Transaction
 func (c *ConstructionAPIController) ConstructionSubmit(w http.ResponseWriter, r *http.Request) {
 	constructionSubmitRequest := &types.ConstructionSubmitRequest{}
diff --git a/server/api_mempool.go b/server/api_mempool.go
index beb40167..789f2b9f 100644
--- a/server/api_mempool.go
+++ b/server/api_mempool.go
@@ -105,16 +105,6 @@ func (c *MempoolAPIController) Mempool(w http.ResponseWriter, r *http.Request) {
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *MempoolAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // MempoolTransaction - Get a Mempool Transaction
 func (c *MempoolAPIController) MempoolTransaction(w http.ResponseWriter, r *http.Request) {
 	mempoolTransactionRequest := &types.MempoolTransactionRequest{}
diff --git a/server/api_network.go b/server/api_network.go
index 91c39e11..323c8aa9 100644
--- a/server/api_network.go
+++ b/server/api_network.go
@@ -111,16 +111,6 @@ func (c *NetworkAPIController) NetworkList(w http.ResponseWriter, r *http.Reques
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *NetworkAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // NetworkOptions - Get Network Options
 func (c *NetworkAPIController) NetworkOptions(w http.ResponseWriter, r *http.Request) {
 	networkRequest := &types.NetworkRequest{}
@@ -151,16 +141,6 @@ func (c *NetworkAPIController) NetworkOptions(w http.ResponseWriter, r *http.Req
 	EncodeJSONResponse(result, http.StatusOK, w)
 }
 
-func (c *NetworkAPIController) ContextFromRequest(r *http.Request) context.Context {
-	ctx := r.Context()
-
-	if c.contextFromRequest != nil {
-		ctx = c.contextFromRequest(r)
-	}
-
-	return ctx
-}
-
 // NetworkStatus - Get Network Status
 func (c *NetworkAPIController) NetworkStatus(w http.ResponseWriter, r *http.Request) {
 	networkRequest := &types.NetworkRequest{}
diff --git a/templates/server/controller-api.mustache b/templates/server/controller-api.mustache
index 07bce453..5d0f422a 100644
--- a/templates/server/controller-api.mustache
+++ b/templates/server/controller-api.mustache
@@ -41,7 +41,7 @@ func (c *{{classname}}Controller) Routes() Routes {
 			c.{{operationId}},
 		},{{/operation}}{{/operations}}
 	}
-}{{#operations}}{{#operation}}
+}
 
 func (c *{{classname}}Controller) ContextFromRequest(r *http.Request) context.Context {
 	ctx := r.Context()
@@ -51,7 +51,7 @@ func (c *{{classname}}Controller) ContextFromRequest(r *http.Request) context.Co
 	}
 
 	return ctx
-}
+}{{#operations}}{{#operation}}
 
 // {{nickname}} - {{{summary}}}
 func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Request) { {{#allParams}}{{#isHeaderParam}}