diff --git a/rhodecode/templates/admin/admin_audit_log_entry.mako b/rhodecode/templates/admin/admin_audit_log_entry.mako
index 0281018d..2ac50c8b 100644
--- a/rhodecode/templates/admin/admin_audit_log_entry.mako
+++ b/rhodecode/templates/admin/admin_audit_log_entry.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%namespace name="base" file="/base/base.mako"/>
 
diff --git a/rhodecode/templates/admin/admin_audit_logs.mako b/rhodecode/templates/admin/admin_audit_logs.mako
index dd10d708..82dbe09f 100644
--- a/rhodecode/templates/admin/admin_audit_logs.mako
+++ b/rhodecode/templates/admin/admin_audit_logs.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/artifacts/artifacts.mako b/rhodecode/templates/admin/artifacts/artifacts.mako
index 5cf1993a..bb248a2b 100644
--- a/rhodecode/templates/admin/artifacts/artifacts.mako
+++ b/rhodecode/templates/admin/artifacts/artifacts.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako
index b8e00d6d..92ae19f2 100644
--- a/rhodecode/templates/admin/auth/auth_settings.mako
+++ b/rhodecode/templates/admin/auth/auth_settings.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/auth/plugin_settings.mako b/rhodecode/templates/admin/auth/plugin_settings.mako
index 8698cc88..07fbac41 100644
--- a/rhodecode/templates/admin/auth/plugin_settings.mako
+++ b/rhodecode/templates/admin/auth/plugin_settings.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/defaults/defaults.mako b/rhodecode/templates/admin/defaults/defaults.mako
index b72d0521..d3ad956b 100644
--- a/rhodecode/templates/admin/defaults/defaults.mako
+++ b/rhodecode/templates/admin/defaults/defaults.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/gists/gist_edit.mako b/rhodecode/templates/admin/gists/gist_edit.mako
index 2b3394e6..8b0528d3 100644
--- a/rhodecode/templates/admin/gists/gist_edit.mako
+++ b/rhodecode/templates/admin/gists/gist_edit.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/gists/gist_index.mako b/rhodecode/templates/admin/gists/gist_index.mako
index b7e4271b..f20bbf0e 100644
--- a/rhodecode/templates/admin/gists/gist_index.mako
+++ b/rhodecode/templates/admin/gists/gist_index.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/gists/gist_new.mako b/rhodecode/templates/admin/gists/gist_new.mako
index 2ccd4438..1ccfeda6 100644
--- a/rhodecode/templates/admin/gists/gist_new.mako
+++ b/rhodecode/templates/admin/gists/gist_new.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/gists/gist_show.mako b/rhodecode/templates/admin/gists/gist_show.mako
index 69cac51b..63188f89 100644
--- a/rhodecode/templates/admin/gists/gist_show.mako
+++ b/rhodecode/templates/admin/gists/gist_show.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
 
diff --git a/rhodecode/templates/admin/integrations/base.mako b/rhodecode/templates/admin/integrations/base.mako
index 6d66a669..0e142062 100644
--- a/rhodecode/templates/admin/integrations/base.mako
+++ b/rhodecode/templates/admin/integrations/base.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%!
    def inherit(context):
       if context['c'].repo:
diff --git a/rhodecode/templates/admin/integrations/form.mako b/rhodecode/templates/admin/integrations/form.mako
index 35d3fcf5..57442668 100644
--- a/rhodecode/templates/admin/integrations/form.mako
+++ b/rhodecode/templates/admin/integrations/form.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="breadcrumbs_links()">
diff --git a/rhodecode/templates/admin/integrations/global.mako b/rhodecode/templates/admin/integrations/global.mako
index ce48b277..a8b6a76f 100644
--- a/rhodecode/templates/admin/integrations/global.mako
+++ b/rhodecode/templates/admin/integrations/global.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/integrations/list.mako b/rhodecode/templates/admin/integrations/list.mako
index 54c75574..a58526ef 100644
--- a/rhodecode/templates/admin/integrations/list.mako
+++ b/rhodecode/templates/admin/integrations/list.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="breadcrumbs_links()">
diff --git a/rhodecode/templates/admin/integrations/new.mako b/rhodecode/templates/admin/integrations/new.mako
index a9d29fbc..4b84541e 100644
--- a/rhodecode/templates/admin/integrations/new.mako
+++ b/rhodecode/templates/admin/integrations/new.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="widgets" file="/widgets.mako"/>
 
diff --git a/rhodecode/templates/admin/main.mako b/rhodecode/templates/admin/main.mako
index 4e45feb0..97478d2f 100644
--- a/rhodecode/templates/admin/main.mako
+++ b/rhodecode/templates/admin/main.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/my_account/my_account.mako b/rhodecode/templates/admin/my_account/my_account.mako
index 623dd152..9ba03b23 100644
--- a/rhodecode/templates/admin/my_account/my_account.mako
+++ b/rhodecode/templates/admin/my_account/my_account.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako b/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
index d4dc7e74..99e1ffa2 100644
--- a/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
+++ b/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 
 <div class="panel panel-default">
   <div class="panel-heading">
diff --git a/rhodecode/templates/admin/notifications/notifications_show.mako b/rhodecode/templates/admin/notifications/notifications_show.mako
index 147a1140..037b62b4 100644
--- a/rhodecode/templates/admin/notifications/notifications_show.mako
+++ b/rhodecode/templates/admin/notifications/notifications_show.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/notifications/notifications_show_all.mako b/rhodecode/templates/admin/notifications/notifications_show_all.mako
index d53e4e60..dd89451f 100644
--- a/rhodecode/templates/admin/notifications/notifications_show_all.mako
+++ b/rhodecode/templates/admin/notifications/notifications_show_all.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/permissions/permissions.mako b/rhodecode/templates/admin/permissions/permissions.mako
index 82bd276d..7e9dcc2a 100644
--- a/rhodecode/templates/admin/permissions/permissions.mako
+++ b/rhodecode/templates/admin/permissions/permissions.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_add.mako b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
index da61aaa4..ff953af5 100644
--- a/rhodecode/templates/admin/repo_groups/repo_group_add.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
index e3dd3e85..53937382 100644
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
index d1d40adc..003b3e09 100644
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
diff --git a/rhodecode/templates/admin/repo_groups/repo_groups.mako b/rhodecode/templates/admin/repo_groups/repo_groups.mako
index e9ab9332..e3069237 100644
--- a/rhodecode/templates/admin/repo_groups/repo_groups.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_groups.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/repos/repo_add.mako b/rhodecode/templates/admin/repos/repo_add.mako
index 0a4e64c1..b39bcc32 100644
--- a/rhodecode/templates/admin/repos/repo_add.mako
+++ b/rhodecode/templates/admin/repos/repo_add.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/repos/repo_add_base.mako b/rhodecode/templates/admin/repos/repo_add_base.mako
index 13b2e072..d1a5c1ca 100644
--- a/rhodecode/templates/admin/repos/repo_add_base.mako
+++ b/rhodecode/templates/admin/repos/repo_add_base.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 
 ${h.secure_form(h.route_path('repo_create'), request=request)}
 <div class="form">
diff --git a/rhodecode/templates/admin/repos/repo_creating.mako b/rhodecode/templates/admin/repos/repo_creating.mako
index b0d701ea..3ebfef70 100644
--- a/rhodecode/templates/admin/repos/repo_creating.mako
+++ b/rhodecode/templates/admin/repos/repo_creating.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index 9c8520b7..55adab33 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 ##
 ## See also repo_settings.html
 ##
diff --git a/rhodecode/templates/admin/repos/repo_edit_audit.mako b/rhodecode/templates/admin/repos/repo_edit_audit.mako
index edf153ca..f8401b4d 100644
--- a/rhodecode/templates/admin/repos/repo_edit_audit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_audit.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 
diff --git a/rhodecode/templates/admin/repos/repo_edit_settings.mako b/rhodecode/templates/admin/repos/repo_edit_settings.mako
index 304295d2..effc29b7 100644
--- a/rhodecode/templates/admin/repos/repo_edit_settings.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_settings.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
diff --git a/rhodecode/templates/admin/repos/repos.mako b/rhodecode/templates/admin/repos/repos.mako
index 3c5509fa..9c4a2df1 100644
--- a/rhodecode/templates/admin/repos/repos.mako
+++ b/rhodecode/templates/admin/repos/repos.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/settings/settings.mako b/rhodecode/templates/admin/settings/settings.mako
index 2df046df..c18db6f9 100644
--- a/rhodecode/templates/admin/settings/settings.mako
+++ b/rhodecode/templates/admin/settings/settings.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/settings/settings_system_update.mako b/rhodecode/templates/admin/settings/settings_system_update.mako
index 3a41200c..4a67545a 100644
--- a/rhodecode/templates/admin/settings/settings_system_update.mako
+++ b/rhodecode/templates/admin/settings/settings_system_update.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 ## upgrade block rendered afte on-click check
 
 <div class="alert ${'alert-warning' if c.should_upgrade else 'alert-success'}">
diff --git a/rhodecode/templates/admin/user_groups/user_group_add.mako b/rhodecode/templates/admin/user_groups/user_group_add.mako
index 802261a3..bc7e005d 100644
--- a/rhodecode/templates/admin/user_groups/user_group_add.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_add.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit.mako b/rhodecode/templates/admin/user_groups/user_group_edit.mako
index d8a7f4e3..ae0d4376 100644
--- a/rhodecode/templates/admin/user_groups/user_group_edit.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
index ac63c777..791be0ec 100644
--- a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
diff --git a/rhodecode/templates/admin/user_groups/user_groups.mako b/rhodecode/templates/admin/user_groups/user_groups.mako
index 4778f167..d5835c25 100644
--- a/rhodecode/templates/admin/user_groups/user_groups.mako
+++ b/rhodecode/templates/admin/user_groups/user_groups.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/users/user_add.mako b/rhodecode/templates/admin/users/user_add.mako
index 395cda50..c2f2fa4c 100644
--- a/rhodecode/templates/admin/users/user_add.mako
+++ b/rhodecode/templates/admin/users/user_add.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/users/user_edit.mako b/rhodecode/templates/admin/users/user_edit.mako
index 2f4ce2d3..1f67bb69 100644
--- a/rhodecode/templates/admin/users/user_edit.mako
+++ b/rhodecode/templates/admin/users/user_edit.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/admin/users/user_edit_audit.mako b/rhodecode/templates/admin/users/user_edit_audit.mako
index 324f4f81..58e5dbb1 100644
--- a/rhodecode/templates/admin/users/user_edit_audit.mako
+++ b/rhodecode/templates/admin/users/user_edit_audit.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 
diff --git a/rhodecode/templates/admin/users/user_edit_groups.mako b/rhodecode/templates/admin/users/user_edit_groups.mako
index a9b814d5..bff0be26 100644
--- a/rhodecode/templates/admin/users/user_edit_groups.mako
+++ b/rhodecode/templates/admin/users/user_edit_groups.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
index 8a9cd539..7d736d15 100644
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/artifacts/artifact_list.mako b/rhodecode/templates/artifacts/artifact_list.mako
index 0cc01b75..68fa8edb 100644
--- a/rhodecode/templates/artifacts/artifact_list.mako
+++ b/rhodecode/templates/artifacts/artifact_list.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 0b6a1525..01a6a187 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 
 <%!
     from rhodecode.lib import html_filters
diff --git a/rhodecode/templates/base/root.mako b/rhodecode/templates/base/root.mako
index 977c87f2..d431a2d3 100644
--- a/rhodecode/templates/base/root.mako
+++ b/rhodecode/templates/base/root.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 
 <%
diff --git a/rhodecode/templates/bookmarks/bookmarks.mako b/rhodecode/templates/bookmarks/bookmarks.mako
index bfbea6d4..a7968268 100644
--- a/rhodecode/templates/bookmarks/bookmarks.mako
+++ b/rhodecode/templates/bookmarks/bookmarks.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%namespace name="components" file="/summary/components.mako"/>
 
diff --git a/rhodecode/templates/branches/branches.mako b/rhodecode/templates/branches/branches.mako
index b1919ee8..8950b027 100644
--- a/rhodecode/templates/branches/branches.mako
+++ b/rhodecode/templates/branches/branches.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%namespace name="components" file="/summary/components.mako"/>
 
diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
index 54d31c27..93aab2c7 100644
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 
 <%inherit file="/base/base.mako"/>
 <%namespace name="base" file="/base/base.mako"/>
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
index e3273a3b..e03e3654 100644
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
 ## ${comment.comment_block(comment)}
diff --git a/rhodecode/templates/changeset/changeset_range.mako b/rhodecode/templates/changeset/changeset_range.mako
index 5cfa4184..4c067d78 100644
--- a/rhodecode/templates/changeset/changeset_range.mako
+++ b/rhodecode/templates/changeset/changeset_range.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/commits/changelog.mako b/rhodecode/templates/commits/changelog.mako
index 81bc5857..eabb1121 100644
--- a/rhodecode/templates/commits/changelog.mako
+++ b/rhodecode/templates/commits/changelog.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 
 <%inherit file="/base/base.mako"/>
 
diff --git a/rhodecode/templates/compare/compare_diff.mako b/rhodecode/templates/compare/compare_diff.mako
index 970baa64..569a7677 100644
--- a/rhodecode/templates/compare/compare_diff.mako
+++ b/rhodecode/templates/compare/compare_diff.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
 
diff --git a/rhodecode/templates/email_templates/base.mako b/rhodecode/templates/email_templates/base.mako
index b58539a9..53cd1b48 100644
--- a/rhodecode/templates/email_templates/base.mako
+++ b/rhodecode/templates/email_templates/base.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 
 ## helpers
 <%def name="tag_button(text, tag_type=None)">
diff --git a/rhodecode/templates/email_templates/commit_comment.mako b/rhodecode/templates/email_templates/commit_comment.mako
index 0d751f7d..c8c6e70b 100644
--- a/rhodecode/templates/email_templates/commit_comment.mako
+++ b/rhodecode/templates/email_templates/commit_comment.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/email_test.mako b/rhodecode/templates/email_templates/email_test.mako
index 814afefd..ab795bf3 100644
--- a/rhodecode/templates/email_templates/email_test.mako
+++ b/rhodecode/templates/email_templates/email_test.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/exception_tracker.mako b/rhodecode/templates/email_templates/exception_tracker.mako
index f3bbc55b..5fde6198 100644
--- a/rhodecode/templates/email_templates/exception_tracker.mako
+++ b/rhodecode/templates/email_templates/exception_tracker.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/main.mako b/rhodecode/templates/email_templates/main.mako
index 752889f9..0e34bb4e 100644
--- a/rhodecode/templates/email_templates/main.mako
+++ b/rhodecode/templates/email_templates/main.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim,whitespace_filter">
diff --git a/rhodecode/templates/email_templates/password_reset.mako b/rhodecode/templates/email_templates/password_reset.mako
index ace11fcf..0f101174 100644
--- a/rhodecode/templates/email_templates/password_reset.mako
+++ b/rhodecode/templates/email_templates/password_reset.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/password_reset_confirmation.mako b/rhodecode/templates/email_templates/password_reset_confirmation.mako
index df11ce3f..63e42760 100644
--- a/rhodecode/templates/email_templates/password_reset_confirmation.mako
+++ b/rhodecode/templates/email_templates/password_reset_confirmation.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/pull_request_comment.mako b/rhodecode/templates/email_templates/pull_request_comment.mako
index 7c2fd274..48a00ab6 100644
--- a/rhodecode/templates/email_templates/pull_request_comment.mako
+++ b/rhodecode/templates/email_templates/pull_request_comment.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/pull_request_review.mako b/rhodecode/templates/email_templates/pull_request_review.mako
index 2d0ea030..2eca1e37 100644
--- a/rhodecode/templates/email_templates/pull_request_review.mako
+++ b/rhodecode/templates/email_templates/pull_request_review.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/pull_request_update.mako b/rhodecode/templates/email_templates/pull_request_update.mako
index d4b9959e..b910b017 100644
--- a/rhodecode/templates/email_templates/pull_request_update.mako
+++ b/rhodecode/templates/email_templates/pull_request_update.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/email_templates/test.mako b/rhodecode/templates/email_templates/test.mako
index c91c0c56..419bad54 100644
--- a/rhodecode/templates/email_templates/test.mako
+++ b/rhodecode/templates/email_templates/test.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim,whitespace_filter">
diff --git a/rhodecode/templates/email_templates/update_available.mako b/rhodecode/templates/email_templates/update_available.mako
index 5c44c233..ddbe67d6 100644
--- a/rhodecode/templates/email_templates/update_available.mako
+++ b/rhodecode/templates/email_templates/update_available.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim,whitespace_filter">
diff --git a/rhodecode/templates/email_templates/user_registration.mako b/rhodecode/templates/email_templates/user_registration.mako
index b1a8f3dd..c3a1c73d 100644
--- a/rhodecode/templates/email_templates/user_registration.mako
+++ b/rhodecode/templates/email_templates/user_registration.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
diff --git a/rhodecode/templates/errors/error_document.mako b/rhodecode/templates/errors/error_document.mako
index d6665fa5..58978505 100644
--- a/rhodecode/templates/errors/error_document.mako
+++ b/rhodecode/templates/errors/error_document.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
diff --git a/rhodecode/templates/feed/atom_feed_entry.mako b/rhodecode/templates/feed/atom_feed_entry.mako
index 0315f6c6..73bf862a 100644
--- a/rhodecode/templates/feed/atom_feed_entry.mako
+++ b/rhodecode/templates/feed/atom_feed_entry.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 
 ${_('%(user)s committed on %(date)s UTC') % {
 'user': h.person(commit.author),
diff --git a/rhodecode/templates/forks/fork.mako b/rhodecode/templates/forks/fork.mako
index ad57fdea..fba091ea 100644
--- a/rhodecode/templates/forks/fork.mako
+++ b/rhodecode/templates/forks/fork.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/forks/forks.mako b/rhodecode/templates/forks/forks.mako
index 99ab41d0..4ec5e271 100644
--- a/rhodecode/templates/forks/forks.mako
+++ b/rhodecode/templates/forks/forks.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/index.mako b/rhodecode/templates/index.mako
index 8bc80c91..dc3f18dc 100644
--- a/rhodecode/templates/index.mako
+++ b/rhodecode/templates/index.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="index_base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/index_repo_group.mako b/rhodecode/templates/index_repo_group.mako
index f8bf7ca9..ea8baac3 100644
--- a/rhodecode/templates/index_repo_group.mako
+++ b/rhodecode/templates/index_repo_group.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="index_base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/journal/journal.mako b/rhodecode/templates/journal/journal.mako
index 8b700e78..38ef808f 100644
--- a/rhodecode/templates/journal/journal.mako
+++ b/rhodecode/templates/journal/journal.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%def name="title()">
     ${_('Journal')}
diff --git a/rhodecode/templates/journal/journal_data.mako b/rhodecode/templates/journal/journal_data.mako
index aca1294e..cb8fe53d 100644
--- a/rhodecode/templates/journal/journal_data.mako
+++ b/rhodecode/templates/journal/journal_data.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 %if c.journal_day_aggreagate:
diff --git a/rhodecode/templates/journal/public_journal.mako b/rhodecode/templates/journal/public_journal.mako
index 7cbd5cfe..047b0daa 100644
--- a/rhodecode/templates/journal/public_journal.mako
+++ b/rhodecode/templates/journal/public_journal.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%def name="title()">
     ${_('Public Journal')}
diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako
index b6167a4d..3c52b0ba 100644
--- a/rhodecode/templates/login.mako
+++ b/rhodecode/templates/login.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base/root.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/password_reset.mako b/rhodecode/templates/password_reset.mako
index 1af47cfb..cb0bfae0 100644
--- a/rhodecode/templates/password_reset.mako
+++ b/rhodecode/templates/password_reset.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base/root.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako
index f5158b0b..aebb5f5c 100644
--- a/rhodecode/templates/register.mako
+++ b/rhodecode/templates/register.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="base/root.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/rst_templates/auto_status_change.mako b/rhodecode/templates/rst_templates/auto_status_change.mako
index 9e3f269b..0d2dd660 100644
--- a/rhodecode/templates/rst_templates/auto_status_change.mako
+++ b/rhodecode/templates/rst_templates/auto_status_change.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 Auto status change to |new_status|
 
 .. |new_status| replace:: *"${new_status_label}"*
\ No newline at end of file
diff --git a/rhodecode/templates/rst_templates/pull_request_update.mako b/rhodecode/templates/rst_templates/pull_request_update.mako
index 917ff229..1fdb0ebf 100644
--- a/rhodecode/templates/rst_templates/pull_request_update.mako
+++ b/rhodecode/templates/rst_templates/pull_request_update.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 Pull request updated. Auto status change to |under_review|
 
 .. role:: added
diff --git a/rhodecode/templates/search/search.mako b/rhodecode/templates/search/search.mako
index 216e7cb0..9d20c3d4 100644
--- a/rhodecode/templates/search/search.mako
+++ b/rhodecode/templates/search/search.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
diff --git a/rhodecode/templates/summary/summary_commits.mako b/rhodecode/templates/summary/summary_commits.mako
index 17e3cf1b..38c38404 100644
--- a/rhodecode/templates/summary/summary_commits.mako
+++ b/rhodecode/templates/summary/summary_commits.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 %if c.repo_commits:
 <table class="rctable table-bordered">
diff --git a/rhodecode/templates/tags/tags.mako b/rhodecode/templates/tags/tags.mako
index 57fe741a..a95c0313 100644
--- a/rhodecode/templates/tags/tags.mako
+++ b/rhodecode/templates/tags/tags.mako
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 <%namespace name="components" file="/summary/components.mako"/>