diff --git a/codegen/templates/http_request_inline.tpl b/codegen/templates/http_request_inline.tpl
index b2bc6ea07..da4de7d4f 100644
--- a/codegen/templates/http_request_inline.tpl
+++ b/codegen/templates/http_request_inline.tpl
@@ -41,8 +41,6 @@ func ({self} *{name|expose}{call.name|capitalize}) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/crm/rest/request/field.go b/crm/rest/request/field.go
index dc6df93fa..dd73fafa1 100644
--- a/crm/rest/request/field.go
+++ b/crm/rest/request/field.go
@@ -48,8 +48,6 @@ func (f *FieldList) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -90,8 +88,6 @@ func (f *FieldType) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/crm/rest/request/module.go b/crm/rest/request/module.go
index fadc47a50..e6ecce0c4 100644
--- a/crm/rest/request/module.go
+++ b/crm/rest/request/module.go
@@ -49,8 +49,6 @@ func (m *ModuleList) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -97,8 +95,6 @@ func (m *ModuleCreate) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -150,8 +146,6 @@ func (m *ModuleRead) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -196,8 +190,6 @@ func (m *ModuleEdit) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -250,8 +242,6 @@ func (m *ModuleDelete) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -294,8 +284,6 @@ func (m *ModuleContentList) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -339,8 +327,6 @@ func (m *ModuleContentCreate) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -390,8 +376,6 @@ func (m *ModuleContentRead) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -437,8 +421,6 @@ func (m *ModuleContentEdit) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -489,8 +471,6 @@ func (m *ModuleContentDelete) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/sam/rest/request/auth.go b/sam/rest/request/auth.go
index fb05995da..d62d57639 100644
--- a/sam/rest/request/auth.go
+++ b/sam/rest/request/auth.go
@@ -50,8 +50,6 @@ func (a *AuthLogin) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -104,8 +102,6 @@ func (a *AuthCreate) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/sam/rest/request/channel.go b/sam/rest/request/channel.go
index fcee202dc..ecc209317 100644
--- a/sam/rest/request/channel.go
+++ b/sam/rest/request/channel.go
@@ -49,8 +49,6 @@ func (c *ChannelList) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -97,8 +95,6 @@ func (c *ChannelCreate) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -152,8 +148,6 @@ func (c *ChannelEdit) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -212,8 +206,6 @@ func (c *ChannelRead) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -256,8 +248,6 @@ func (c *ChannelDelete) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -300,8 +290,6 @@ func (c *ChannelMembers) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -344,8 +332,6 @@ func (c *ChannelJoin) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -389,8 +375,6 @@ func (c *ChannelPart) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -435,8 +419,6 @@ func (c *ChannelInvite) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/sam/rest/request/message.go b/sam/rest/request/message.go
index 0a8ed9b8b..ce19924be 100644
--- a/sam/rest/request/message.go
+++ b/sam/rest/request/message.go
@@ -50,8 +50,6 @@ func (m *MessageCreate) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -99,8 +97,6 @@ func (m *MessageHistory) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -149,8 +145,6 @@ func (m *MessageEdit) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -199,8 +193,6 @@ func (m *MessageDelete) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -244,8 +236,6 @@ func (m *MessageAttach) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -290,8 +280,6 @@ func (m *MessageSearch) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -343,8 +331,6 @@ func (m *MessagePin) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -389,8 +375,6 @@ func (m *MessageUnpin) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -435,8 +419,6 @@ func (m *MessageFlag) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -481,8 +463,6 @@ func (m *MessageUnflag) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -528,8 +508,6 @@ func (m *MessageReact) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -576,8 +554,6 @@ func (m *MessageUnreact) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/sam/rest/request/organisation.go b/sam/rest/request/organisation.go
index 5cdc378af..7524bf7d5 100644
--- a/sam/rest/request/organisation.go
+++ b/sam/rest/request/organisation.go
@@ -49,8 +49,6 @@ func (o *OrganisationList) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -96,8 +94,6 @@ func (o *OrganisationCreate) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -144,8 +140,6 @@ func (o *OrganisationEdit) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -192,8 +186,6 @@ func (o *OrganisationRemove) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -236,8 +228,6 @@ func (o *OrganisationRead) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -283,8 +273,6 @@ func (o *OrganisationArchive) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/sam/rest/request/team.go b/sam/rest/request/team.go
index c4d1b47bf..8af5bfbeb 100644
--- a/sam/rest/request/team.go
+++ b/sam/rest/request/team.go
@@ -49,8 +49,6 @@ func (t *TeamList) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -97,8 +95,6 @@ func (t *TeamCreate) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -146,8 +142,6 @@ func (t *TeamEdit) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -194,8 +188,6 @@ func (t *TeamRead) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -238,8 +230,6 @@ func (t *TeamRemove) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -282,8 +272,6 @@ func (t *TeamArchive) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -327,8 +315,6 @@ func (t *TeamMove) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -376,8 +362,6 @@ func (t *TeamMerge) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
diff --git a/sam/rest/request/user.go b/sam/rest/request/user.go
index 15b52d196..211586ab1 100644
--- a/sam/rest/request/user.go
+++ b/sam/rest/request/user.go
@@ -49,8 +49,6 @@ func (u *UserSearch) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()
@@ -97,8 +95,6 @@ func (u *UserMessage) Fill(r *http.Request) error {
 		case err != nil:
 			err = errors.Wrap(err, "error parsing http request body")
 		}
-
-		return err
 	}
 
 	r.ParseForm()