diff --git a/rhodecode/apps/__init__.py b/rhodecode/apps/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/__init__.py
+++ b/rhodecode/apps/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index 5ef89106..68f7da67 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/_base/interfaces.py b/rhodecode/apps/_base/interfaces.py
index 8d51a4ed..4d062e30 100644
--- a/rhodecode/apps/_base/interfaces.py
+++ b/rhodecode/apps/_base/interfaces.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/_base/navigation.py b/rhodecode/apps/_base/navigation.py
index d1690b8f..3b856c0d 100644
--- a/rhodecode/apps/_base/navigation.py
+++ b/rhodecode/apps/_base/navigation.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/_base/subscribers.py b/rhodecode/apps/_base/subscribers.py
index ef4bec39..a8b78463 100644
--- a/rhodecode/apps/_base/subscribers.py
+++ b/rhodecode/apps/_base/subscribers.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/__init__.py b/rhodecode/apps/admin/__init__.py
index 9486dd04..76f662a0 100644
--- a/rhodecode/apps/admin/__init__.py
+++ b/rhodecode/apps/admin/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_audit_logs.py b/rhodecode/apps/admin/tests/test_admin_audit_logs.py
index 89b34ec4..0bf89115 100644
--- a/rhodecode/apps/admin/tests/test_admin_audit_logs.py
+++ b/rhodecode/apps/admin/tests/test_admin_audit_logs.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_auth_settings.py b/rhodecode/apps/admin/tests/test_admin_auth_settings.py
index d90cb0cc..598a1885 100644
--- a/rhodecode/apps/admin/tests/test_admin_auth_settings.py
+++ b/rhodecode/apps/admin/tests/test_admin_auth_settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_defaults.py b/rhodecode/apps/admin/tests/test_admin_defaults.py
index 2f44d664..fba7bebb 100644
--- a/rhodecode/apps/admin/tests/test_admin_defaults.py
+++ b/rhodecode/apps/admin/tests/test_admin_defaults.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_main_views.py b/rhodecode/apps/admin/tests/test_admin_main_views.py
index b440df75..301d331e 100644
--- a/rhodecode/apps/admin/tests/test_admin_main_views.py
+++ b/rhodecode/apps/admin/tests/test_admin_main_views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_permissions.py b/rhodecode/apps/admin/tests/test_admin_permissions.py
index c2bd2d11..929a5a0b 100644
--- a/rhodecode/apps/admin/tests/test_admin_permissions.py
+++ b/rhodecode/apps/admin/tests/test_admin_permissions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_repos.py b/rhodecode/apps/admin/tests/test_admin_repos.py
index f1638de4..104804fc 100644
--- a/rhodecode/apps/admin/tests/test_admin_repos.py
+++ b/rhodecode/apps/admin/tests/test_admin_repos.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_repository_groups.py b/rhodecode/apps/admin/tests/test_admin_repository_groups.py
index e1993a63..336cb293 100644
--- a/rhodecode/apps/admin/tests/test_admin_repository_groups.py
+++ b/rhodecode/apps/admin/tests/test_admin_repository_groups.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_settings.py b/rhodecode/apps/admin/tests/test_admin_settings.py
index b213e4bb..a0f3085e 100644
--- a/rhodecode/apps/admin/tests/test_admin_settings.py
+++ b/rhodecode/apps/admin/tests/test_admin_settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_user_groups.py b/rhodecode/apps/admin/tests/test_admin_user_groups.py
index 9561397c..056c03e9 100644
--- a/rhodecode/apps/admin/tests/test_admin_user_groups.py
+++ b/rhodecode/apps/admin/tests/test_admin_user_groups.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_users.py b/rhodecode/apps/admin/tests/test_admin_users.py
index 9775bd86..67c6d814 100644
--- a/rhodecode/apps/admin/tests/test_admin_users.py
+++ b/rhodecode/apps/admin/tests/test_admin_users.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py b/rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py
index 4030b810..b5ae4546 100644
--- a/rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py
+++ b/rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/__init__.py b/rhodecode/apps/admin/views/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/admin/views/__init__.py
+++ b/rhodecode/apps/admin/views/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/artifacts.py b/rhodecode/apps/admin/views/artifacts.py
index f27134f5..255edb17 100644
--- a/rhodecode/apps/admin/views/artifacts.py
+++ b/rhodecode/apps/admin/views/artifacts.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/audit_logs.py b/rhodecode/apps/admin/views/audit_logs.py
index 62c8a530..e5c04e74 100644
--- a/rhodecode/apps/admin/views/audit_logs.py
+++ b/rhodecode/apps/admin/views/audit_logs.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/defaults.py b/rhodecode/apps/admin/views/defaults.py
index 696fc36a..0519f140 100644
--- a/rhodecode/apps/admin/views/defaults.py
+++ b/rhodecode/apps/admin/views/defaults.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/exception_tracker.py b/rhodecode/apps/admin/views/exception_tracker.py
index 422deab7..88c94052 100644
--- a/rhodecode/apps/admin/views/exception_tracker.py
+++ b/rhodecode/apps/admin/views/exception_tracker.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2018-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/main_views.py b/rhodecode/apps/admin/views/main_views.py
index 9e7585ec..fa68d51e 100644
--- a/rhodecode/apps/admin/views/main_views.py
+++ b/rhodecode/apps/admin/views/main_views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/open_source_licenses.py b/rhodecode/apps/admin/views/open_source_licenses.py
index 19b199b8..60a4fee7 100644
--- a/rhodecode/apps/admin/views/open_source_licenses.py
+++ b/rhodecode/apps/admin/views/open_source_licenses.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/permissions.py b/rhodecode/apps/admin/views/permissions.py
index 5d271f17..7711a696 100644
--- a/rhodecode/apps/admin/views/permissions.py
+++ b/rhodecode/apps/admin/views/permissions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/process_management.py b/rhodecode/apps/admin/views/process_management.py
index ab15137e..237765a9 100644
--- a/rhodecode/apps/admin/views/process_management.py
+++ b/rhodecode/apps/admin/views/process_management.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/repo_groups.py b/rhodecode/apps/admin/views/repo_groups.py
index db7d25d3..35af86a2 100644
--- a/rhodecode/apps/admin/views/repo_groups.py
+++ b/rhodecode/apps/admin/views/repo_groups.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/repositories.py b/rhodecode/apps/admin/views/repositories.py
index 3f08b7ca..61d93316 100644
--- a/rhodecode/apps/admin/views/repositories.py
+++ b/rhodecode/apps/admin/views/repositories.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/sessions.py b/rhodecode/apps/admin/views/sessions.py
index 5fccd0fc..af0e91c4 100644
--- a/rhodecode/apps/admin/views/sessions.py
+++ b/rhodecode/apps/admin/views/sessions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/settings.py b/rhodecode/apps/admin/views/settings.py
index 2129c73e..e041b078 100644
--- a/rhodecode/apps/admin/views/settings.py
+++ b/rhodecode/apps/admin/views/settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/svn_config.py b/rhodecode/apps/admin/views/svn_config.py
index e98f639b..054d1199 100644
--- a/rhodecode/apps/admin/views/svn_config.py
+++ b/rhodecode/apps/admin/views/svn_config.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/system_info.py b/rhodecode/apps/admin/views/system_info.py
index 9dc3a495..84392976 100644
--- a/rhodecode/apps/admin/views/system_info.py
+++ b/rhodecode/apps/admin/views/system_info.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/user_groups.py b/rhodecode/apps/admin/views/user_groups.py
index 4f1ab4e9..4eef95f1 100644
--- a/rhodecode/apps/admin/views/user_groups.py
+++ b/rhodecode/apps/admin/views/user_groups.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index f16023a8..c1f9f755 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/channelstream/__init__.py b/rhodecode/apps/channelstream/__init__.py
index d2c8f810..7505ff49 100644
--- a/rhodecode/apps/channelstream/__init__.py
+++ b/rhodecode/apps/channelstream/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/channelstream/views.py b/rhodecode/apps/channelstream/views.py
index 6b186e94..e96cea26 100644
--- a/rhodecode/apps/channelstream/views.py
+++ b/rhodecode/apps/channelstream/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/debug_style/__init__.py b/rhodecode/apps/debug_style/__init__.py
index fd87ea6f..72788fa3 100644
--- a/rhodecode/apps/debug_style/__init__.py
+++ b/rhodecode/apps/debug_style/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/debug_style/views.py b/rhodecode/apps/debug_style/views.py
index 62bf1ab6..02d84bf5 100644
--- a/rhodecode/apps/debug_style/views.py
+++ b/rhodecode/apps/debug_style/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/__init__.py b/rhodecode/apps/file_store/__init__.py
index f2fae1a3..66b71aae 100755
--- a/rhodecode/apps/file_store/__init__.py
+++ b/rhodecode/apps/file_store/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/backends/__init__.py b/rhodecode/apps/file_store/backends/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/file_store/backends/__init__.py
+++ b/rhodecode/apps/file_store/backends/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/backends/local_store.py b/rhodecode/apps/file_store/backends/local_store.py
index a5ae16e7..dd0e4065 100755
--- a/rhodecode/apps/file_store/backends/local_store.py
+++ b/rhodecode/apps/file_store/backends/local_store.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/config_keys.py b/rhodecode/apps/file_store/config_keys.py
index 0b519f17..f31b9f17 100644
--- a/rhodecode/apps/file_store/config_keys.py
+++ b/rhodecode/apps/file_store/config_keys.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/exceptions.py b/rhodecode/apps/file_store/exceptions.py
index 91753633..48888db5 100755
--- a/rhodecode/apps/file_store/exceptions.py
+++ b/rhodecode/apps/file_store/exceptions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/extensions.py b/rhodecode/apps/file_store/extensions.py
index 567551a9..ce5cf695 100644
--- a/rhodecode/apps/file_store/extensions.py
+++ b/rhodecode/apps/file_store/extensions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/tests/__init__.py b/rhodecode/apps/file_store/tests/__init__.py
index 91fde18e..bb7db42f 100644
--- a/rhodecode/apps/file_store/tests/__init__.py
+++ b/rhodecode/apps/file_store/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/tests/test_upload_file.py b/rhodecode/apps/file_store/tests/test_upload_file.py
index 897dca84..f1321180 100644
--- a/rhodecode/apps/file_store/tests/test_upload_file.py
+++ b/rhodecode/apps/file_store/tests/test_upload_file.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/utils.py b/rhodecode/apps/file_store/utils.py
index 5ff247b8..7d934c12 100755
--- a/rhodecode/apps/file_store/utils.py
+++ b/rhodecode/apps/file_store/utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/file_store/views.py b/rhodecode/apps/file_store/views.py
index 0b54fbac..b757445e 100644
--- a/rhodecode/apps/file_store/views.py
+++ b/rhodecode/apps/file_store/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/gist/__init__.py b/rhodecode/apps/gist/__init__.py
index 63344079..af1ec79c 100644
--- a/rhodecode/apps/gist/__init__.py
+++ b/rhodecode/apps/gist/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/gist/tests/__init__.py b/rhodecode/apps/gist/tests/__init__.py
index 91fde18e..bb7db42f 100644
--- a/rhodecode/apps/gist/tests/__init__.py
+++ b/rhodecode/apps/gist/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/gist/tests/test_admin_gists.py b/rhodecode/apps/gist/tests/test_admin_gists.py
index 5f0dcec4..8d5c04b2 100644
--- a/rhodecode/apps/gist/tests/test_admin_gists.py
+++ b/rhodecode/apps/gist/tests/test_admin_gists.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/gist/views.py b/rhodecode/apps/gist/views.py
index 03d7bcd2..7e456868 100644
--- a/rhodecode/apps/gist/views.py
+++ b/rhodecode/apps/gist/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2013-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/home/__init__.py b/rhodecode/apps/home/__init__.py
index ccb00541..da335372 100644
--- a/rhodecode/apps/home/__init__.py
+++ b/rhodecode/apps/home/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/home/tests/__init__.py b/rhodecode/apps/home/tests/__init__.py
index b71756f7..5e1d9e43 100644
--- a/rhodecode/apps/home/tests/__init__.py
+++ b/rhodecode/apps/home/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/home/tests/test_get_goto_switched_data.py b/rhodecode/apps/home/tests/test_get_goto_switched_data.py
index 0026e868..a938ece5 100644
--- a/rhodecode/apps/home/tests/test_get_goto_switched_data.py
+++ b/rhodecode/apps/home/tests/test_get_goto_switched_data.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
@@ -18,8 +18,6 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import json
-
 import pytest
 
 from . import assert_and_get_main_filter_content
@@ -27,6 +25,7 @@ from rhodecode.tests import TestController, TEST_USER_ADMIN_LOGIN
 from rhodecode.tests.fixture import Fixture
 
 from rhodecode.lib.utils import map_groups
+from rhodecode.lib.ext_json import json
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.db import Session, Repository, RepoGroup
@@ -35,7 +34,9 @@ fixture = Fixture()
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib.request, urllib.parse, urllib.error
+    import urllib.request
+    import urllib.parse
+    import urllib.error
 
     base_url = {
         'goto_switcher_data': '/_goto_data',
diff --git a/rhodecode/apps/home/tests/test_get_repo_list_data.py b/rhodecode/apps/home/tests/test_get_repo_list_data.py
index 2f6ae9fe..f659c741 100644
--- a/rhodecode/apps/home/tests/test_get_repo_list_data.py
+++ b/rhodecode/apps/home/tests/test_get_repo_list_data.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/home/tests/test_get_user_data.py b/rhodecode/apps/home/tests/test_get_user_data.py
index 4066d5b1..9e42961a 100644
--- a/rhodecode/apps/home/tests/test_get_user_data.py
+++ b/rhodecode/apps/home/tests/test_get_user_data.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/home/tests/test_get_user_group_data.py b/rhodecode/apps/home/tests/test_get_user_group_data.py
index 878dc408..ca8196e8 100644
--- a/rhodecode/apps/home/tests/test_get_user_group_data.py
+++ b/rhodecode/apps/home/tests/test_get_user_group_data.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/home/tests/test_home.py b/rhodecode/apps/home/tests/test_home.py
index d68d3fbe..194ec0db 100644
--- a/rhodecode/apps/home/tests/test_home.py
+++ b/rhodecode/apps/home/tests/test_home.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index cfe8db59..1f4e395b 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/hovercards/__init__.py b/rhodecode/apps/hovercards/__init__.py
index ba27bd7f..65f3587d 100644
--- a/rhodecode/apps/hovercards/__init__.py
+++ b/rhodecode/apps/hovercards/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2018-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/hovercards/views.py b/rhodecode/apps/hovercards/views.py
index 3adcf2a2..5c491b89 100644
--- a/rhodecode/apps/hovercards/views.py
+++ b/rhodecode/apps/hovercards/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/journal/__init__.py b/rhodecode/apps/journal/__init__.py
index 6281a93a..61de0dc2 100644
--- a/rhodecode/apps/journal/__init__.py
+++ b/rhodecode/apps/journal/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/journal/tests/__init__.py b/rhodecode/apps/journal/tests/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/journal/tests/__init__.py
+++ b/rhodecode/apps/journal/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/journal/tests/test_journal.py b/rhodecode/apps/journal/tests/test_journal.py
index c4296df0..fd8ba778 100644
--- a/rhodecode/apps/journal/tests/test_journal.py
+++ b/rhodecode/apps/journal/tests/test_journal.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/journal/views.py b/rhodecode/apps/journal/views.py
index a2ecaeb9..04026cf6 100644
--- a/rhodecode/apps/journal/views.py
+++ b/rhodecode/apps/journal/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/login/__init__.py b/rhodecode/apps/login/__init__.py
index db5f0689..e398d027 100644
--- a/rhodecode/apps/login/__init__.py
+++ b/rhodecode/apps/login/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/login/tests/test_login.py b/rhodecode/apps/login/tests/test_login.py
index 867ba39a..1b0fea39 100644
--- a/rhodecode/apps/login/tests/test_login.py
+++ b/rhodecode/apps/login/tests/test_login.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/login/tests/test_password_reset.py b/rhodecode/apps/login/tests/test_password_reset.py
index ebeee9d5..7a592431 100644
--- a/rhodecode/apps/login/tests/test_password_reset.py
+++ b/rhodecode/apps/login/tests/test_password_reset.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/login/tests/test_register_captcha.py b/rhodecode/apps/login/tests/test_register_captcha.py
index ea42d467..63186281 100644
--- a/rhodecode/apps/login/tests/test_register_captcha.py
+++ b/rhodecode/apps/login/tests/test_register_captcha.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py
index 11dc3d0a..847d3211 100644
--- a/rhodecode/apps/login/views.py
+++ b/rhodecode/apps/login/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
@@ -91,6 +91,7 @@ def store_user_in_session(session, username, remember=False):
 def get_came_from(request):
     came_from = safe_str(request.GET.get('came_from', ''))
     parsed = urllib.parse.urlparse(came_from)
+
     allowed_schemes = ['http', 'https']
     default_came_from = h.route_path('home')
     if parsed.scheme and parsed.scheme not in allowed_schemes:
@@ -101,7 +102,7 @@ def get_came_from(request):
         log.error('Suspicious NETLOC detected %s for url %s server url '
                   'is: %s', parsed.netloc, parsed, request.host)
         came_from = default_came_from
-    elif any(bad_str in parsed.path for bad_str in ('\r', '\n')):
+    elif any(bad_char in came_from for bad_char in ('\r', '\n')):
         log.error('Header injection detected `%s` for url %s server url ',
                   parsed.path, parsed)
         came_from = default_came_from
diff --git a/rhodecode/apps/my_account/__init__.py b/rhodecode/apps/my_account/__init__.py
index 856113e8..90858435 100644
--- a/rhodecode/apps/my_account/__init__.py
+++ b/rhodecode/apps/my_account/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/__init__.py b/rhodecode/apps/my_account/tests/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/my_account/tests/__init__.py
+++ b/rhodecode/apps/my_account/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py b/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py
index cc799b0f..0a86575a 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/test_my_account_edit.py b/rhodecode/apps/my_account/tests/test_my_account_edit.py
index 486d591d..8c84d2e6 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_edit.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_edit.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
@@ -17,7 +17,7 @@
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
@@ -45,7 +45,9 @@ from rhodecode.lib import helpers as h
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib.request, urllib.parse, urllib.error
+    import urllib.request
+    import urllib.parse
+    import urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
diff --git a/rhodecode/apps/my_account/tests/test_my_account_emails.py b/rhodecode/apps/my_account/tests/test_my_account_emails.py
index ddab8a02..6e6233df 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_emails.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_emails.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/test_my_account_notifications.py b/rhodecode/apps/my_account/tests/test_my_account_notifications.py
index ecb03384..9a09910d 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_notifications.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_notifications.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/test_my_account_password.py b/rhodecode/apps/my_account/tests/test_my_account_password.py
index cfa35f2e..30a70a2f 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_password.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_password.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/test_my_account_profile.py b/rhodecode/apps/my_account/tests/test_my_account_profile.py
index bd44511d..87d3d50a 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_profile.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_profile.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/test_my_account_simple_views.py b/rhodecode/apps/my_account/tests/test_my_account_simple_views.py
index 88eb0f22..293b8a2e 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_simple_views.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_simple_views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py b/rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py
index a4380a2c..d2d4a5ce 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/views/__init__.py b/rhodecode/apps/my_account/views/__init__.py
index af040e2a..535bf57b 100644
--- a/rhodecode/apps/my_account/views/__init__.py
+++ b/rhodecode/apps/my_account/views/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/views/my_account.py b/rhodecode/apps/my_account/views/my_account.py
index 82c94448..8562b781 100644
--- a/rhodecode/apps/my_account/views/my_account.py
+++ b/rhodecode/apps/my_account/views/my_account.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/views/my_account_notifications.py b/rhodecode/apps/my_account/views/my_account_notifications.py
index 9be39dca..15a94a95 100644
--- a/rhodecode/apps/my_account/views/my_account_notifications.py
+++ b/rhodecode/apps/my_account/views/my_account_notifications.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/my_account/views/my_account_ssh_keys.py b/rhodecode/apps/my_account/views/my_account_ssh_keys.py
index a8febf97..ae1497ca 100644
--- a/rhodecode/apps/my_account/views/my_account_ssh_keys.py
+++ b/rhodecode/apps/my_account/views/my_account_ssh_keys.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ops/__init__.py b/rhodecode/apps/ops/__init__.py
index 7279e061..6ea89033 100644
--- a/rhodecode/apps/ops/__init__.py
+++ b/rhodecode/apps/ops/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ops/views.py b/rhodecode/apps/ops/views.py
index 84cbc5fd..88a9d96a 100644
--- a/rhodecode/apps/ops/views.py
+++ b/rhodecode/apps/ops/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/__init__.py b/rhodecode/apps/repo_group/__init__.py
index 3d3edc1e..b4e76507 100644
--- a/rhodecode/apps/repo_group/__init__.py
+++ b/rhodecode/apps/repo_group/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/tests/__init__.py b/rhodecode/apps/repo_group/tests/__init__.py
index 4d33ee94..cd9db391 100644
--- a/rhodecode/apps/repo_group/tests/__init__.py
+++ b/rhodecode/apps/repo_group/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py b/rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py
index 5b14a27e..16760956 100644
--- a/rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py
+++ b/rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py b/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py
index 37a25969..af8426a1 100644
--- a/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py
+++ b/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/tests/test_repo_groups_settings.py b/rhodecode/apps/repo_group/tests/test_repo_groups_settings.py
index 2e285a97..ecae61b3 100644
--- a/rhodecode/apps/repo_group/tests/test_repo_groups_settings.py
+++ b/rhodecode/apps/repo_group/tests/test_repo_groups_settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/views/__init__.py b/rhodecode/apps/repo_group/views/__init__.py
index f21da2d7..d48ed718 100644
--- a/rhodecode/apps/repo_group/views/__init__.py
+++ b/rhodecode/apps/repo_group/views/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/views/repo_group_advanced.py b/rhodecode/apps/repo_group/views/repo_group_advanced.py
index 174210f9..158039ba 100644
--- a/rhodecode/apps/repo_group/views/repo_group_advanced.py
+++ b/rhodecode/apps/repo_group/views/repo_group_advanced.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/views/repo_group_permissions.py b/rhodecode/apps/repo_group/views/repo_group_permissions.py
index 66eb6640..50456bca 100644
--- a/rhodecode/apps/repo_group/views/repo_group_permissions.py
+++ b/rhodecode/apps/repo_group/views/repo_group_permissions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repo_group/views/repo_group_settings.py b/rhodecode/apps/repo_group/views/repo_group_settings.py
index c730af59..523d6624 100644
--- a/rhodecode/apps/repo_group/views/repo_group_settings.py
+++ b/rhodecode/apps/repo_group/views/repo_group_settings.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index dca501c8..95780c96 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/__init__.py b/rhodecode/apps/repository/tests/__init__.py
index 4d33ee94..cd9db391 100644
--- a/rhodecode/apps/repository/tests/__init__.py
+++ b/rhodecode/apps/repository/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_pull_requests_list.py b/rhodecode/apps/repository/tests/test_pull_requests_list.py
index f9de3602..1b9caa6e 100644
--- a/rhodecode/apps/repository/tests/test_pull_requests_list.py
+++ b/rhodecode/apps/repository/tests/test_pull_requests_list.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_bookmarks.py b/rhodecode/apps/repository/tests/test_repo_bookmarks.py
index bb98e030..a0699cda 100644
--- a/rhodecode/apps/repository/tests/test_repo_bookmarks.py
+++ b/rhodecode/apps/repository/tests/test_repo_bookmarks.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_branches.py b/rhodecode/apps/repository/tests/test_repo_branches.py
index 68025512..287a2df8 100644
--- a/rhodecode/apps/repository/tests/test_repo_branches.py
+++ b/rhodecode/apps/repository/tests/test_repo_branches.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_changelog.py b/rhodecode/apps/repository/tests/test_repo_changelog.py
index 99abb005..82231631 100644
--- a/rhodecode/apps/repository/tests/test_repo_changelog.py
+++ b/rhodecode/apps/repository/tests/test_repo_changelog.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_commit_comments.py b/rhodecode/apps/repository/tests/test_repo_commit_comments.py
index e2b0f0f5..db0932df 100644
--- a/rhodecode/apps/repository/tests/test_repo_commit_comments.py
+++ b/rhodecode/apps/repository/tests/test_repo_commit_comments.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_commits.py b/rhodecode/apps/repository/tests/test_repo_commits.py
index f879bae1..4e2986e4 100644
--- a/rhodecode/apps/repository/tests/test_repo_commits.py
+++ b/rhodecode/apps/repository/tests/test_repo_commits.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_compare.py b/rhodecode/apps/repository/tests/test_repo_compare.py
index c6278b19..884d3dec 100644
--- a/rhodecode/apps/repository/tests/test_repo_compare.py
+++ b/rhodecode/apps/repository/tests/test_repo_compare.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_compare_local.py b/rhodecode/apps/repository/tests/test_repo_compare_local.py
index d338d158..4f288e0d 100644
--- a/rhodecode/apps/repository/tests/test_repo_compare_local.py
+++ b/rhodecode/apps/repository/tests/test_repo_compare_local.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py b/rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py
index 1be1ab41..ff3f53ab 100644
--- a/rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py
+++ b/rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_files.py b/rhodecode/apps/repository/tests/test_repo_files.py
index 6fcb0e2b..82ad400c 100644
--- a/rhodecode/apps/repository/tests/test_repo_files.py
+++ b/rhodecode/apps/repository/tests/test_repo_files.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_forks.py b/rhodecode/apps/repository/tests/test_repo_forks.py
index f2fd0aa4..45bfa06c 100644
--- a/rhodecode/apps/repository/tests/test_repo_forks.py
+++ b/rhodecode/apps/repository/tests/test_repo_forks.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_issue_tracker.py b/rhodecode/apps/repository/tests/test_repo_issue_tracker.py
index 52a0380e..be43b899 100644
--- a/rhodecode/apps/repository/tests/test_repo_issue_tracker.py
+++ b/rhodecode/apps/repository/tests/test_repo_issue_tracker.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_maintainance.py b/rhodecode/apps/repository/tests/test_repo_maintainance.py
index bfe56afb..fdd55a10 100644
--- a/rhodecode/apps/repository/tests/test_repo_maintainance.py
+++ b/rhodecode/apps/repository/tests/test_repo_maintainance.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_permissions.py b/rhodecode/apps/repository/tests/test_repo_permissions.py
index 1207f3ac..e72198a7 100644
--- a/rhodecode/apps/repository/tests/test_repo_permissions.py
+++ b/rhodecode/apps/repository/tests/test_repo_permissions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_pullrequests.py b/rhodecode/apps/repository/tests/test_repo_pullrequests.py
index b46a1f53..412a36dc 100644
--- a/rhodecode/apps/repository/tests/test_repo_pullrequests.py
+++ b/rhodecode/apps/repository/tests/test_repo_pullrequests.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_settings.py b/rhodecode/apps/repository/tests/test_repo_settings.py
index fdc9f2d7..561abf86 100644
--- a/rhodecode/apps/repository/tests/test_repo_settings.py
+++ b/rhodecode/apps/repository/tests/test_repo_settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_settings_advanced.py b/rhodecode/apps/repository/tests/test_repo_settings_advanced.py
index e8938f53..5f6b797c 100644
--- a/rhodecode/apps/repository/tests/test_repo_settings_advanced.py
+++ b/rhodecode/apps/repository/tests/test_repo_settings_advanced.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_summary.py b/rhodecode/apps/repository/tests/test_repo_summary.py
index 6dcc4f36..f6cc0eff 100644
--- a/rhodecode/apps/repository/tests/test_repo_summary.py
+++ b/rhodecode/apps/repository/tests/test_repo_summary.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_repo_vcs_settings.py b/rhodecode/apps/repository/tests/test_repo_vcs_settings.py
index 89bb949c..34ee5d64 100644
--- a/rhodecode/apps/repository/tests/test_repo_vcs_settings.py
+++ b/rhodecode/apps/repository/tests/test_repo_vcs_settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/tests/test_vcs_settings.py b/rhodecode/apps/repository/tests/test_vcs_settings.py
index 70ae94db..2d684f95 100644
--- a/rhodecode/apps/repository/tests/test_vcs_settings.py
+++ b/rhodecode/apps/repository/tests/test_vcs_settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/utils.py b/rhodecode/apps/repository/utils.py
index c724df8e..13bcf521 100644
--- a/rhodecode/apps/repository/utils.py
+++ b/rhodecode/apps/repository/utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/__init__.py b/rhodecode/apps/repository/views/__init__.py
index af040e2a..535bf57b 100644
--- a/rhodecode/apps/repository/views/__init__.py
+++ b/rhodecode/apps/repository/views/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_artifacts.py b/rhodecode/apps/repository/views/repo_artifacts.py
index 7d2e08d4..f48e06dc 100644
--- a/rhodecode/apps/repository/views/repo_artifacts.py
+++ b/rhodecode/apps/repository/views/repo_artifacts.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_audit_logs.py b/rhodecode/apps/repository/views/repo_audit_logs.py
index 5c554884..6f1e80c0 100644
--- a/rhodecode/apps/repository/views/repo_audit_logs.py
+++ b/rhodecode/apps/repository/views/repo_audit_logs.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_automation.py b/rhodecode/apps/repository/views/repo_automation.py
index 5e4ea375..26804516 100644
--- a/rhodecode/apps/repository/views/repo_automation.py
+++ b/rhodecode/apps/repository/views/repo_automation.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_bookmarks.py b/rhodecode/apps/repository/views/repo_bookmarks.py
index f5f2a02e..7b627dbf 100644
--- a/rhodecode/apps/repository/views/repo_bookmarks.py
+++ b/rhodecode/apps/repository/views/repo_bookmarks.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_branch_permissions.py b/rhodecode/apps/repository/views/repo_branch_permissions.py
index 73cae4a4..1f44f8d9 100644
--- a/rhodecode/apps/repository/views/repo_branch_permissions.py
+++ b/rhodecode/apps/repository/views/repo_branch_permissions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_branches.py b/rhodecode/apps/repository/views/repo_branches.py
index 53c7d7ef..646eb697 100644
--- a/rhodecode/apps/repository/views/repo_branches.py
+++ b/rhodecode/apps/repository/views/repo_branches.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_caches.py b/rhodecode/apps/repository/views/repo_caches.py
index 9f8f8c6a..059760f8 100644
--- a/rhodecode/apps/repository/views/repo_caches.py
+++ b/rhodecode/apps/repository/views/repo_caches.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_changelog.py b/rhodecode/apps/repository/views/repo_changelog.py
index 925c5c63..df749d28 100644
--- a/rhodecode/apps/repository/views/repo_changelog.py
+++ b/rhodecode/apps/repository/views/repo_changelog.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_checks.py b/rhodecode/apps/repository/views/repo_checks.py
index f3e4304e..3dad5ac6 100644
--- a/rhodecode/apps/repository/views/repo_checks.py
+++ b/rhodecode/apps/repository/views/repo_checks.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_commits.py b/rhodecode/apps/repository/views/repo_commits.py
index f21e4ecc..095a5452 100644
--- a/rhodecode/apps/repository/views/repo_commits.py
+++ b/rhodecode/apps/repository/views/repo_commits.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_compare.py b/rhodecode/apps/repository/views/repo_compare.py
index 4af7521f..2bb0ce75 100644
--- a/rhodecode/apps/repository/views/repo_compare.py
+++ b/rhodecode/apps/repository/views/repo_compare.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_feed.py b/rhodecode/apps/repository/views/repo_feed.py
index 7edabbe4..0359353b 100644
--- a/rhodecode/apps/repository/views/repo_feed.py
+++ b/rhodecode/apps/repository/views/repo_feed.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_files.py b/rhodecode/apps/repository/views/repo_files.py
index 2e223063..d6c4448c 100644
--- a/rhodecode/apps/repository/views/repo_files.py
+++ b/rhodecode/apps/repository/views/repo_files.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_forks.py b/rhodecode/apps/repository/views/repo_forks.py
index 1c2c8f0f..e3ac3148 100644
--- a/rhodecode/apps/repository/views/repo_forks.py
+++ b/rhodecode/apps/repository/views/repo_forks.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_maintainance.py b/rhodecode/apps/repository/views/repo_maintainance.py
index ffa1af2b..f8fb1c34 100644
--- a/rhodecode/apps/repository/views/repo_maintainance.py
+++ b/rhodecode/apps/repository/views/repo_maintainance.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_permissions.py b/rhodecode/apps/repository/views/repo_permissions.py
index 9359be67..21b051f9 100644
--- a/rhodecode/apps/repository/views/repo_permissions.py
+++ b/rhodecode/apps/repository/views/repo_permissions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
index af17b7c0..f8c9d833 100644
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_review_rules.py b/rhodecode/apps/repository/views/repo_review_rules.py
index 3db8247c..22a04b0b 100644
--- a/rhodecode/apps/repository/views/repo_review_rules.py
+++ b/rhodecode/apps/repository/views/repo_review_rules.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_settings.py b/rhodecode/apps/repository/views/repo_settings.py
index e86baae9..17d7bb75 100644
--- a/rhodecode/apps/repository/views/repo_settings.py
+++ b/rhodecode/apps/repository/views/repo_settings.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
index a06d50fc..4757dae3 100644
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_settings_fields.py b/rhodecode/apps/repository/views/repo_settings_fields.py
index dff10841..35cd272d 100644
--- a/rhodecode/apps/repository/views/repo_settings_fields.py
+++ b/rhodecode/apps/repository/views/repo_settings_fields.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_settings_issue_trackers.py b/rhodecode/apps/repository/views/repo_settings_issue_trackers.py
index c8e5b4e5..eb2ebf97 100644
--- a/rhodecode/apps/repository/views/repo_settings_issue_trackers.py
+++ b/rhodecode/apps/repository/views/repo_settings_issue_trackers.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_settings_remote.py b/rhodecode/apps/repository/views/repo_settings_remote.py
index f1a3105c..863a4ddc 100644
--- a/rhodecode/apps/repository/views/repo_settings_remote.py
+++ b/rhodecode/apps/repository/views/repo_settings_remote.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_settings_vcs.py b/rhodecode/apps/repository/views/repo_settings_vcs.py
index 6542a754..d78e019e 100644
--- a/rhodecode/apps/repository/views/repo_settings_vcs.py
+++ b/rhodecode/apps/repository/views/repo_settings_vcs.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_strip.py b/rhodecode/apps/repository/views/repo_strip.py
index 74622ce8..d091cff4 100644
--- a/rhodecode/apps/repository/views/repo_strip.py
+++ b/rhodecode/apps/repository/views/repo_strip.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_summary.py b/rhodecode/apps/repository/views/repo_summary.py
index 8bdd2734..fe5f7fd8 100644
--- a/rhodecode/apps/repository/views/repo_summary.py
+++ b/rhodecode/apps/repository/views/repo_summary.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/repository/views/repo_tags.py b/rhodecode/apps/repository/views/repo_tags.py
index c07019dd..e3ec6924 100644
--- a/rhodecode/apps/repository/views/repo_tags.py
+++ b/rhodecode/apps/repository/views/repo_tags.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/search/__init__.py b/rhodecode/apps/search/__init__.py
index 168323b9..8b38c804 100644
--- a/rhodecode/apps/search/__init__.py
+++ b/rhodecode/apps/search/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/search/tests/test_search.py b/rhodecode/apps/search/tests/test_search.py
index bc2b07fb..39327d40 100644
--- a/rhodecode/apps/search/tests/test_search.py
+++ b/rhodecode/apps/search/tests/test_search.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/search/views.py b/rhodecode/apps/search/views.py
index 750701f0..69e6293c 100644
--- a/rhodecode/apps/search/views.py
+++ b/rhodecode/apps/search/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/__init__.py b/rhodecode/apps/ssh_support/__init__.py
index 6db682da..e0996712 100644
--- a/rhodecode/apps/ssh_support/__init__.py
+++ b/rhodecode/apps/ssh_support/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/config_keys.py b/rhodecode/apps/ssh_support/config_keys.py
index fd13f143..0f0d9232 100644
--- a/rhodecode/apps/ssh_support/config_keys.py
+++ b/rhodecode/apps/ssh_support/config_keys.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/lib/__init__.py b/rhodecode/apps/ssh_support/lib/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/ssh_support/lib/__init__.py
+++ b/rhodecode/apps/ssh_support/lib/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/lib/backends/__init__.py b/rhodecode/apps/ssh_support/lib/backends/__init__.py
index 17e4d549..8d4581c4 100644
--- a/rhodecode/apps/ssh_support/lib/backends/__init__.py
+++ b/rhodecode/apps/ssh_support/lib/backends/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/lib/backends/base.py b/rhodecode/apps/ssh_support/lib/backends/base.py
index a5c9acb0..5fcc2785 100644
--- a/rhodecode/apps/ssh_support/lib/backends/base.py
+++ b/rhodecode/apps/ssh_support/lib/backends/base.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/lib/backends/git.py b/rhodecode/apps/ssh_support/lib/backends/git.py
index 707b2c57..279cbfb9 100644
--- a/rhodecode/apps/ssh_support/lib/backends/git.py
+++ b/rhodecode/apps/ssh_support/lib/backends/git.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/lib/backends/hg.py b/rhodecode/apps/ssh_support/lib/backends/hg.py
index a7b30fc1..f7f8682c 100644
--- a/rhodecode/apps/ssh_support/lib/backends/hg.py
+++ b/rhodecode/apps/ssh_support/lib/backends/hg.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/lib/ssh_wrapper.py b/rhodecode/apps/ssh_support/lib/ssh_wrapper.py
index c15c06a9..3208675d 100644
--- a/rhodecode/apps/ssh_support/lib/ssh_wrapper.py
+++ b/rhodecode/apps/ssh_support/lib/ssh_wrapper.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/subscribers.py b/rhodecode/apps/ssh_support/subscribers.py
index e84e1d81..c3e866f3 100644
--- a/rhodecode/apps/ssh_support/subscribers.py
+++ b/rhodecode/apps/ssh_support/subscribers.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/tests/__init__.py b/rhodecode/apps/ssh_support/tests/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/ssh_support/tests/__init__.py
+++ b/rhodecode/apps/ssh_support/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/tests/conftest.py b/rhodecode/apps/ssh_support/tests/conftest.py
index deecb13c..e140599e 100644
--- a/rhodecode/apps/ssh_support/tests/conftest.py
+++ b/rhodecode/apps/ssh_support/tests/conftest.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/tests/test_server_git.py b/rhodecode/apps/ssh_support/tests/test_server_git.py
index 36e04dae..7205c003 100644
--- a/rhodecode/apps/ssh_support/tests/test_server_git.py
+++ b/rhodecode/apps/ssh_support/tests/test_server_git.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/tests/test_server_hg.py b/rhodecode/apps/ssh_support/tests/test_server_hg.py
index c9f9bdc1..b451e41b 100644
--- a/rhodecode/apps/ssh_support/tests/test_server_hg.py
+++ b/rhodecode/apps/ssh_support/tests/test_server_hg.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/tests/test_server_svn.py b/rhodecode/apps/ssh_support/tests/test_server_svn.py
index f55f8bad..3d8cf47b 100644
--- a/rhodecode/apps/ssh_support/tests/test_server_svn.py
+++ b/rhodecode/apps/ssh_support/tests/test_server_svn.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/tests/test_ssh_authorized_keys_gen.py b/rhodecode/apps/ssh_support/tests/test_ssh_authorized_keys_gen.py
index 374d598f..2b9022b7 100644
--- a/rhodecode/apps/ssh_support/tests/test_ssh_authorized_keys_gen.py
+++ b/rhodecode/apps/ssh_support/tests/test_ssh_authorized_keys_gen.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py b/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py
index dc42ce2f..d97d451a 100644
--- a/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py
+++ b/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/ssh_support/utils.py b/rhodecode/apps/ssh_support/utils.py
index f1ce65cd..89e186fc 100644
--- a/rhodecode/apps/ssh_support/utils.py
+++ b/rhodecode/apps/ssh_support/utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/svn_support/__init__.py b/rhodecode/apps/svn_support/__init__.py
index af12c428..24b2ef3b 100644
--- a/rhodecode/apps/svn_support/__init__.py
+++ b/rhodecode/apps/svn_support/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/svn_support/config_keys.py b/rhodecode/apps/svn_support/config_keys.py
index 31a7bf65..d64d53a8 100644
--- a/rhodecode/apps/svn_support/config_keys.py
+++ b/rhodecode/apps/svn_support/config_keys.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/svn_support/subscribers.py b/rhodecode/apps/svn_support/subscribers.py
index 94d39608..dc3c6edb 100644
--- a/rhodecode/apps/svn_support/subscribers.py
+++ b/rhodecode/apps/svn_support/subscribers.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py b/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py
index 9aeb2648..5391d190 100644
--- a/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py
+++ b/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/svn_support/utils.py b/rhodecode/apps/svn_support/utils.py
index 50ff34da..75e157f9 100644
--- a/rhodecode/apps/svn_support/utils.py
+++ b/rhodecode/apps/svn_support/utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group/__init__.py b/rhodecode/apps/user_group/__init__.py
index 0a11adc7..40bf42fc 100644
--- a/rhodecode/apps/user_group/__init__.py
+++ b/rhodecode/apps/user_group/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group/tests/__init__.py b/rhodecode/apps/user_group/tests/__init__.py
index 4ffa930c..f1cbe17b 100644
--- a/rhodecode/apps/user_group/tests/__init__.py
+++ b/rhodecode/apps/user_group/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group/tests/test_user_groups.py b/rhodecode/apps/user_group/tests/test_user_groups.py
index ffdc23b7..57cbceb6 100644
--- a/rhodecode/apps/user_group/tests/test_user_groups.py
+++ b/rhodecode/apps/user_group/tests/test_user_groups.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group/tests/test_user_groups_permissions.py b/rhodecode/apps/user_group/tests/test_user_groups_permissions.py
index f36b9656..55c774c1 100644
--- a/rhodecode/apps/user_group/tests/test_user_groups_permissions.py
+++ b/rhodecode/apps/user_group/tests/test_user_groups_permissions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group/views/__init__.py b/rhodecode/apps/user_group/views/__init__.py
index a58c8505..2aedf275 100644
--- a/rhodecode/apps/user_group/views/__init__.py
+++ b/rhodecode/apps/user_group/views/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group_profile/__init__.py b/rhodecode/apps/user_group_profile/__init__.py
index 9027f7dc..c669a15a 100644
--- a/rhodecode/apps/user_group_profile/__init__.py
+++ b/rhodecode/apps/user_group_profile/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group_profile/tests/__init__.py b/rhodecode/apps/user_group_profile/tests/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/user_group_profile/tests/__init__.py
+++ b/rhodecode/apps/user_group_profile/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group_profile/tests/test_user_group.py b/rhodecode/apps/user_group_profile/tests/test_user_group.py
index f09ff258..ffabab38 100644
--- a/rhodecode/apps/user_group_profile/tests/test_user_group.py
+++ b/rhodecode/apps/user_group_profile/tests/test_user_group.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_group_profile/views.py b/rhodecode/apps/user_group_profile/views.py
index c7184aad..c65ba34b 100644
--- a/rhodecode/apps/user_group_profile/views.py
+++ b/rhodecode/apps/user_group_profile/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_profile/__init__.py b/rhodecode/apps/user_profile/__init__.py
index 66d2c980..71baf75f 100644
--- a/rhodecode/apps/user_profile/__init__.py
+++ b/rhodecode/apps/user_profile/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_profile/tests/__init__.py b/rhodecode/apps/user_profile/tests/__init__.py
index 878569f5..4dcadbf7 100644
--- a/rhodecode/apps/user_profile/tests/__init__.py
+++ b/rhodecode/apps/user_profile/tests/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_profile/tests/test_users.py b/rhodecode/apps/user_profile/tests/test_users.py
index c8956c52..6b7e2bfa 100644
--- a/rhodecode/apps/user_profile/tests/test_users.py
+++ b/rhodecode/apps/user_profile/tests/test_users.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/apps/user_profile/views.py b/rhodecode/apps/user_profile/views.py
index 1694fd31..d9e87620 100644
--- a/rhodecode/apps/user_profile/views.py
+++ b/rhodecode/apps/user_profile/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #