diff --git a/app/email.go b/app/email.go
index ed9a71a1d5..4d2938f6d4 100644
--- a/app/email.go
+++ b/app/email.go
@@ -319,7 +319,6 @@ func (a *App) SendInviteEmails(team *model.Team, senderName string, senderUserId
bodyPage.Props["Title"] = utils.T("api.templates.invite_body.title")
bodyPage.Html["Info"] = utils.TranslateAsHtml(utils.T, "api.templates.invite_body.info",
map[string]interface{}{"SenderStatus": senderRole, "SenderName": senderName, "TeamDisplayName": team.DisplayName})
- bodyPage.Props["Info"] = map[string]interface{}{}
bodyPage.Props["Button"] = utils.T("api.templates.invite_body.button")
bodyPage.Html["ExtraInfo"] = utils.TranslateAsHtml(utils.T, "api.templates.invite_body.extra_info",
map[string]interface{}{"TeamDisplayName": team.DisplayName})
diff --git a/templates/signup_team_body.html b/templates/signup_team_body.html
deleted file mode 100644
index 683a9891e2..0000000000
--- a/templates/signup_team_body.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{{define "signup_team_body"}}
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
- {{.Props.Title}}
-
- {{.Props.Button}}
-
- {{.Html.Info}}
- |
-
-
- {{template "email_info" . }}
-
-
- |
-
-
- {{template "email_footer" . }}
-
-
- |
-
-
- |
-
-
-
-{{end}}
diff --git a/templates/upgrade_30_body.html b/templates/upgrade_30_body.html
deleted file mode 100644
index 38de49d3b2..0000000000
--- a/templates/upgrade_30_body.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{{define "upgrade_30_body"}}
-
-
-
-
-
-
-
-
-
-
-
-
- |
- {{ .Html.Info }}
- |
-
-
- {{template "email_info" . }}
-
-
- |
-
-
- {{template "email_footer" . }}
-
-
- |
-
-
- |
-
-
-
-{{end}}
-
-
diff --git a/templates/username_change_body.html b/templates/username_change_body.html
deleted file mode 100644
index 56c383d49c..0000000000
--- a/templates/username_change_body.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{{define "username_change_body"}}
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
- {{.Props.Title}}
- {{.Html.Info}}
- |
-
-
- {{template "email_info" . }}
-
-
- |
-
-
- {{template "email_footer" . }}
-
-
- |
-
-
- |
-
-
-
-{{end}}