diff --git a/rhodecode/lib/__init__.py b/rhodecode/lib/__init__.py
--- a/rhodecode/lib/__init__.py
+++ b/rhodecode/lib/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/action_parser.py b/rhodecode/lib/action_parser.py
--- a/rhodecode/lib/action_parser.py
+++ b/rhodecode/lib/action_parser.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/caching_query.py b/rhodecode/lib/caching_query.py
--- a/rhodecode/lib/caching_query.py
+++ b/rhodecode/lib/caching_query.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/celerylib/__init__.py b/rhodecode/lib/celerylib/__init__.py
--- a/rhodecode/lib/celerylib/__init__.py
+++ b/rhodecode/lib/celerylib/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/celerylib/loader.py b/rhodecode/lib/celerylib/loader.py
--- a/rhodecode/lib/celerylib/loader.py
+++ b/rhodecode/lib/celerylib/loader.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/celerylib/scheduler.py b/rhodecode/lib/celerylib/scheduler.py
--- a/rhodecode/lib/celerylib/scheduler.py
+++ b/rhodecode/lib/celerylib/scheduler.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py
--- a/rhodecode/lib/celerylib/tasks.py
+++ b/rhodecode/lib/celerylib/tasks.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/celerylib/utils.py b/rhodecode/lib/celerylib/utils.py
--- a/rhodecode/lib/celerylib/utils.py
+++ b/rhodecode/lib/celerylib/utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/channelstream.py b/rhodecode/lib/channelstream.py
--- a/rhodecode/lib/channelstream.py
+++ b/rhodecode/lib/channelstream.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/codeblocks.py b/rhodecode/lib/codeblocks.py
--- a/rhodecode/lib/codeblocks.py
+++ b/rhodecode/lib/codeblocks.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/colander_utils.py b/rhodecode/lib/colander_utils.py
--- a/rhodecode/lib/colander_utils.py
+++ b/rhodecode/lib/colander_utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/colored_formatter.py b/rhodecode/lib/colored_formatter.py
--- a/rhodecode/lib/colored_formatter.py
+++ b/rhodecode/lib/colored_formatter.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/datelib.py b/rhodecode/lib/datelib.py
--- a/rhodecode/lib/datelib.py
+++ b/rhodecode/lib/datelib.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py
--- a/rhodecode/lib/db_manage.py
+++ b/rhodecode/lib/db_manage.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py
--- a/rhodecode/lib/diffs.py
+++ b/rhodecode/lib/diffs.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/enc_utils.py b/rhodecode/lib/enc_utils.py
--- a/rhodecode/lib/enc_utils.py
+++ b/rhodecode/lib/enc_utils.py
@@ -14,6 +14,7 @@ def encrypt_value(value: bytes, enc_key:
     if not algo:
         # not explicit algo, just use what's set by config
         algo = get_default_algo()
+
     if algo not in ALLOWED_ALGOS:
         ValueError(f'Bad encryption algorithm, should be {ALLOWED_ALGOS}, got: {algo}')
 
diff --git a/rhodecode/lib/encrypt.py b/rhodecode/lib/encrypt.py
--- a/rhodecode/lib/encrypt.py
+++ b/rhodecode/lib/encrypt.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/exc_tracking.py b/rhodecode/lib/exc_tracking.py
--- a/rhodecode/lib/exc_tracking.py
+++ b/rhodecode/lib/exc_tracking.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/exceptions.py b/rhodecode/lib/exceptions.py
--- a/rhodecode/lib/exceptions.py
+++ b/rhodecode/lib/exceptions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/ext_json_renderer.py b/rhodecode/lib/ext_json_renderer.py
--- a/rhodecode/lib/ext_json_renderer.py
+++ b/rhodecode/lib/ext_json_renderer.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/feedgenerator/__init__.py b/rhodecode/lib/feedgenerator/__init__.py
--- a/rhodecode/lib/feedgenerator/__init__.py
+++ b/rhodecode/lib/feedgenerator/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/graphmod.py b/rhodecode/lib/graphmod.py
--- a/rhodecode/lib/graphmod.py
+++ b/rhodecode/lib/graphmod.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/hash_utils.py b/rhodecode/lib/hash_utils.py
--- a/rhodecode/lib/hash_utils.py
+++ b/rhodecode/lib/hash_utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py
--- a/rhodecode/lib/hooks_base.py
+++ b/rhodecode/lib/hooks_base.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2013-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/hooks_daemon.py b/rhodecode/lib/hooks_daemon.py
--- a/rhodecode/lib/hooks_daemon.py
+++ b/rhodecode/lib/hooks_daemon.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/hooks_utils.py b/rhodecode/lib/hooks_utils.py
--- a/rhodecode/lib/hooks_utils.py
+++ b/rhodecode/lib/hooks_utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/html_filters.py b/rhodecode/lib/html_filters.py
--- a/rhodecode/lib/html_filters.py
+++ b/rhodecode/lib/html_filters.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2020-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/index/__init__.py b/rhodecode/lib/index/__init__.py
--- a/rhodecode/lib/index/__init__.py
+++ b/rhodecode/lib/index/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/index/search_utils.py b/rhodecode/lib/index/search_utils.py
--- a/rhodecode/lib/index/search_utils.py
+++ b/rhodecode/lib/index/search_utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/index/whoosh.py b/rhodecode/lib/index/whoosh.py
--- a/rhodecode/lib/index/whoosh.py
+++ b/rhodecode/lib/index/whoosh.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/index/whoosh_fallback_schema.py b/rhodecode/lib/index/whoosh_fallback_schema.py
--- a/rhodecode/lib/index/whoosh_fallback_schema.py
+++ b/rhodecode/lib/index/whoosh_fallback_schema.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/jsonalchemy.py b/rhodecode/lib/jsonalchemy.py
--- a/rhodecode/lib/jsonalchemy.py
+++ b/rhodecode/lib/jsonalchemy.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/logging_formatter.py b/rhodecode/lib/logging_formatter.py
--- a/rhodecode/lib/logging_formatter.py
+++ b/rhodecode/lib/logging_formatter.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/markdown_ext.py b/rhodecode/lib/markdown_ext.py
--- a/rhodecode/lib/markdown_ext.py
+++ b/rhodecode/lib/markdown_ext.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/markup_renderer.py b/rhodecode/lib/markup_renderer.py
--- a/rhodecode/lib/markup_renderer.py
+++ b/rhodecode/lib/markup_renderer.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/memory_lru_dict.py b/rhodecode/lib/memory_lru_dict.py
--- a/rhodecode/lib/memory_lru_dict.py
+++ b/rhodecode/lib/memory_lru_dict.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/__init__.py b/rhodecode/lib/middleware/__init__.py
--- a/rhodecode/lib/middleware/__init__.py
+++ b/rhodecode/lib/middleware/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/appenlight.py b/rhodecode/lib/middleware/appenlight.py
--- a/rhodecode/lib/middleware/appenlight.py
+++ b/rhodecode/lib/middleware/appenlight.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/csrf.py b/rhodecode/lib/middleware/csrf.py
--- a/rhodecode/lib/middleware/csrf.py
+++ b/rhodecode/lib/middleware/csrf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/https_fixup.py b/rhodecode/lib/middleware/https_fixup.py
--- a/rhodecode/lib/middleware/https_fixup.py
+++ b/rhodecode/lib/middleware/https_fixup.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/request_wrapper.py b/rhodecode/lib/middleware/request_wrapper.py
--- a/rhodecode/lib/middleware/request_wrapper.py
+++ b/rhodecode/lib/middleware/request_wrapper.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/simplegit.py b/rhodecode/lib/middleware/simplegit.py
--- a/rhodecode/lib/middleware/simplegit.py
+++ b/rhodecode/lib/middleware/simplegit.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/simplehg.py b/rhodecode/lib/middleware/simplehg.py
--- a/rhodecode/lib/middleware/simplehg.py
+++ b/rhodecode/lib/middleware/simplehg.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/simplesvn.py b/rhodecode/lib/middleware/simplesvn.py
--- a/rhodecode/lib/middleware/simplesvn.py
+++ b/rhodecode/lib/middleware/simplesvn.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/simplevcs.py b/rhodecode/lib/middleware/simplevcs.py
--- a/rhodecode/lib/middleware/simplevcs.py
+++ b/rhodecode/lib/middleware/simplevcs.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/utils/__init__.py b/rhodecode/lib/middleware/utils/__init__.py
--- a/rhodecode/lib/middleware/utils/__init__.py
+++ b/rhodecode/lib/middleware/utils/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/utils/scm_app.py b/rhodecode/lib/middleware/utils/scm_app.py
--- a/rhodecode/lib/middleware/utils/scm_app.py
+++ b/rhodecode/lib/middleware/utils/scm_app.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/utils/scm_app_http.py b/rhodecode/lib/middleware/utils/scm_app_http.py
--- a/rhodecode/lib/middleware/utils/scm_app_http.py
+++ b/rhodecode/lib/middleware/utils/scm_app_http.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/utils/wsgi_app_caller_client.py b/rhodecode/lib/middleware/utils/wsgi_app_caller_client.py
--- a/rhodecode/lib/middleware/utils/wsgi_app_caller_client.py
+++ b/rhodecode/lib/middleware/utils/wsgi_app_caller_client.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2012-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/middleware/vcs.py b/rhodecode/lib/middleware/vcs.py
--- a/rhodecode/lib/middleware/vcs.py
+++ b/rhodecode/lib/middleware/vcs.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/pagination.py b/rhodecode/lib/pagination.py
--- a/rhodecode/lib/pagination.py
+++ b/rhodecode/lib/pagination.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (c) 2007-2012 Christoph Haas <email@christoph-haas.de>
 # NOTE: MIT license based code, backported and edited by RhodeCode GmbH
diff --git a/rhodecode/lib/partial_renderer.py b/rhodecode/lib/partial_renderer.py
--- a/rhodecode/lib/partial_renderer.py
+++ b/rhodecode/lib/partial_renderer.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/paster_commands/__init__.py b/rhodecode/lib/paster_commands/__init__.py
--- a/rhodecode/lib/paster_commands/__init__.py
+++ b/rhodecode/lib/paster_commands/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/paster_commands/deprecated/celeryd.py b/rhodecode/lib/paster_commands/deprecated/celeryd.py
--- a/rhodecode/lib/paster_commands/deprecated/celeryd.py
+++ b/rhodecode/lib/paster_commands/deprecated/celeryd.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2013-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/paster_commands/deprecated/setup_rhodecode.py b/rhodecode/lib/paster_commands/deprecated/setup_rhodecode.py
--- a/rhodecode/lib/paster_commands/deprecated/setup_rhodecode.py
+++ b/rhodecode/lib/paster_commands/deprecated/setup_rhodecode.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/paster_commands/upgrade_db.py b/rhodecode/lib/paster_commands/upgrade_db.py
--- a/rhodecode/lib/paster_commands/upgrade_db.py
+++ b/rhodecode/lib/paster_commands/upgrade_db.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/pidlock.py b/rhodecode/lib/pidlock.py
--- a/rhodecode/lib/pidlock.py
+++ b/rhodecode/lib/pidlock.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/plugins/__init__.py b/rhodecode/lib/plugins/__init__.py
--- a/rhodecode/lib/plugins/__init__.py
+++ b/rhodecode/lib/plugins/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/plugins/utils.py b/rhodecode/lib/plugins/utils.py
--- a/rhodecode/lib/plugins/utils.py
+++ b/rhodecode/lib/plugins/utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/pyramid_shell/__init__.py b/rhodecode/lib/pyramid_shell/__init__.py
--- a/rhodecode/lib/pyramid_shell/__init__.py
+++ b/rhodecode/lib/pyramid_shell/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/pyramid_utils.py b/rhodecode/lib/pyramid_utils.py
--- a/rhodecode/lib/pyramid_utils.py
+++ b/rhodecode/lib/pyramid_utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_cache/__init__.py b/rhodecode/lib/rc_cache/__init__.py
--- a/rhodecode/lib/rc_cache/__init__.py
+++ b/rhodecode/lib/rc_cache/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2015-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_cache/backends.py b/rhodecode/lib/rc_cache/backends.py
--- a/rhodecode/lib/rc_cache/backends.py
+++ b/rhodecode/lib/rc_cache/backends.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_cache/cache_key_meta.py b/rhodecode/lib/rc_cache/cache_key_meta.py
--- a/rhodecode/lib/rc_cache/cache_key_meta.py
+++ b/rhodecode/lib/rc_cache/cache_key_meta.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2015-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_cache/region_meta.py b/rhodecode/lib/rc_cache/region_meta.py
--- a/rhodecode/lib/rc_cache/region_meta.py
+++ b/rhodecode/lib/rc_cache/region_meta.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2015-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_cache/utils.py b/rhodecode/lib/rc_cache/utils.py
--- a/rhodecode/lib/rc_cache/utils.py
+++ b/rhodecode/lib/rc_cache/utils.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (C) 2015-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/rhodecode/lib/rc_commands/add_artifact.py b/rhodecode/lib/rc_commands/add_artifact.py
--- a/rhodecode/lib/rc_commands/add_artifact.py
+++ b/rhodecode/lib/rc_commands/add_artifact.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_commands/ishell.py b/rhodecode/lib/rc_commands/ishell.py
--- a/rhodecode/lib/rc_commands/ishell.py
+++ b/rhodecode/lib/rc_commands/ishell.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_commands/setup_rc.py b/rhodecode/lib/rc_commands/setup_rc.py
--- a/rhodecode/lib/rc_commands/setup_rc.py
+++ b/rhodecode/lib/rc_commands/setup_rc.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/rc_commands/upgrade_db.py b/rhodecode/lib/rc_commands/upgrade_db.py
--- a/rhodecode/lib/rc_commands/upgrade_db.py
+++ b/rhodecode/lib/rc_commands/upgrade_db.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/repo_maintenance.py b/rhodecode/lib/repo_maintenance.py
--- a/rhodecode/lib/repo_maintenance.py
+++ b/rhodecode/lib/repo_maintenance.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/request.py b/rhodecode/lib/request.py
--- a/rhodecode/lib/request.py
+++ b/rhodecode/lib/request.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/request_counter.py b/rhodecode/lib/request_counter.py
--- a/rhodecode/lib/request_counter.py
+++ b/rhodecode/lib/request_counter.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/str_utils.py b/rhodecode/lib/str_utils.py
--- a/rhodecode/lib/str_utils.py
+++ b/rhodecode/lib/str_utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/string_renderer.py b/rhodecode/lib/string_renderer.py
--- a/rhodecode/lib/string_renderer.py
+++ b/rhodecode/lib/string_renderer.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py
--- a/rhodecode/lib/system_info.py
+++ b/rhodecode/lib/system_info.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/type_utils.py b/rhodecode/lib/type_utils.py
--- a/rhodecode/lib/type_utils.py
+++ b/rhodecode/lib/type_utils.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/user_log_filter.py b/rhodecode/lib/user_log_filter.py
--- a/rhodecode/lib/user_log_filter.py
+++ b/rhodecode/lib/user_log_filter.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/user_sessions.py b/rhodecode/lib/user_sessions.py
--- a/rhodecode/lib/user_sessions.py
+++ b/rhodecode/lib/user_sessions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2017-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/__init__.py b/rhodecode/lib/vcs/__init__.py
--- a/rhodecode/lib/vcs/__init__.py
+++ b/rhodecode/lib/vcs/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/__init__.py b/rhodecode/lib/vcs/backends/__init__.py
--- a/rhodecode/lib/vcs/backends/__init__.py
+++ b/rhodecode/lib/vcs/backends/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/git/__init__.py b/rhodecode/lib/vcs/backends/git/__init__.py
--- a/rhodecode/lib/vcs/backends/git/__init__.py
+++ b/rhodecode/lib/vcs/backends/git/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/git/commit.py b/rhodecode/lib/vcs/backends/git/commit.py
--- a/rhodecode/lib/vcs/backends/git/commit.py
+++ b/rhodecode/lib/vcs/backends/git/commit.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/git/diff.py b/rhodecode/lib/vcs/backends/git/diff.py
--- a/rhodecode/lib/vcs/backends/git/diff.py
+++ b/rhodecode/lib/vcs/backends/git/diff.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/git/inmemory.py b/rhodecode/lib/vcs/backends/git/inmemory.py
--- a/rhodecode/lib/vcs/backends/git/inmemory.py
+++ b/rhodecode/lib/vcs/backends/git/inmemory.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py
--- a/rhodecode/lib/vcs/backends/git/repository.py
+++ b/rhodecode/lib/vcs/backends/git/repository.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/hg/__init__.py b/rhodecode/lib/vcs/backends/hg/__init__.py
--- a/rhodecode/lib/vcs/backends/hg/__init__.py
+++ b/rhodecode/lib/vcs/backends/hg/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/hg/commit.py b/rhodecode/lib/vcs/backends/hg/commit.py
--- a/rhodecode/lib/vcs/backends/hg/commit.py
+++ b/rhodecode/lib/vcs/backends/hg/commit.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/hg/diff.py b/rhodecode/lib/vcs/backends/hg/diff.py
--- a/rhodecode/lib/vcs/backends/hg/diff.py
+++ b/rhodecode/lib/vcs/backends/hg/diff.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/hg/inmemory.py b/rhodecode/lib/vcs/backends/hg/inmemory.py
--- a/rhodecode/lib/vcs/backends/hg/inmemory.py
+++ b/rhodecode/lib/vcs/backends/hg/inmemory.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py
--- a/rhodecode/lib/vcs/backends/hg/repository.py
+++ b/rhodecode/lib/vcs/backends/hg/repository.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/svn/__init__.py b/rhodecode/lib/vcs/backends/svn/__init__.py
--- a/rhodecode/lib/vcs/backends/svn/__init__.py
+++ b/rhodecode/lib/vcs/backends/svn/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/svn/commit.py b/rhodecode/lib/vcs/backends/svn/commit.py
--- a/rhodecode/lib/vcs/backends/svn/commit.py
+++ b/rhodecode/lib/vcs/backends/svn/commit.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/svn/diff.py b/rhodecode/lib/vcs/backends/svn/diff.py
--- a/rhodecode/lib/vcs/backends/svn/diff.py
+++ b/rhodecode/lib/vcs/backends/svn/diff.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/svn/inmemory.py b/rhodecode/lib/vcs/backends/svn/inmemory.py
--- a/rhodecode/lib/vcs/backends/svn/inmemory.py
+++ b/rhodecode/lib/vcs/backends/svn/inmemory.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/backends/svn/repository.py b/rhodecode/lib/vcs/backends/svn/repository.py
--- a/rhodecode/lib/vcs/backends/svn/repository.py
+++ b/rhodecode/lib/vcs/backends/svn/repository.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/client_http.py b/rhodecode/lib/vcs/client_http.py
--- a/rhodecode/lib/vcs/client_http.py
+++ b/rhodecode/lib/vcs/client_http.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/conf/__init__.py b/rhodecode/lib/vcs/conf/__init__.py
--- a/rhodecode/lib/vcs/conf/__init__.py
+++ b/rhodecode/lib/vcs/conf/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/conf/mtypes.py b/rhodecode/lib/vcs/conf/mtypes.py
--- a/rhodecode/lib/vcs/conf/mtypes.py
+++ b/rhodecode/lib/vcs/conf/mtypes.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/conf/settings.py b/rhodecode/lib/vcs/conf/settings.py
--- a/rhodecode/lib/vcs/conf/settings.py
+++ b/rhodecode/lib/vcs/conf/settings.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/connection.py b/rhodecode/lib/vcs/connection.py
--- a/rhodecode/lib/vcs/connection.py
+++ b/rhodecode/lib/vcs/connection.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/exceptions.py b/rhodecode/lib/vcs/exceptions.py
--- a/rhodecode/lib/vcs/exceptions.py
+++ b/rhodecode/lib/vcs/exceptions.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/geventcurl.py b/rhodecode/lib/vcs/geventcurl.py
--- a/rhodecode/lib/vcs/geventcurl.py
+++ b/rhodecode/lib/vcs/geventcurl.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/nodes.py b/rhodecode/lib/vcs/nodes.py
--- a/rhodecode/lib/vcs/nodes.py
+++ b/rhodecode/lib/vcs/nodes.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/path.py b/rhodecode/lib/vcs/path.py
--- a/rhodecode/lib/vcs/path.py
+++ b/rhodecode/lib/vcs/path.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/utils/__init__.py b/rhodecode/lib/vcs/utils/__init__.py
--- a/rhodecode/lib/vcs/utils/__init__.py
+++ b/rhodecode/lib/vcs/utils/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/utils/helpers.py b/rhodecode/lib/vcs/utils/helpers.py
--- a/rhodecode/lib/vcs/utils/helpers.py
+++ b/rhodecode/lib/vcs/utils/helpers.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 # Copyright (C) 2014-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/utils/imports.py b/rhodecode/lib/vcs/utils/imports.py
--- a/rhodecode/lib/vcs/utils/imports.py
+++ b/rhodecode/lib/vcs/utils/imports.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/vcs/utils/paths.py b/rhodecode/lib/vcs/utils/paths.py
--- a/rhodecode/lib/vcs/utils/paths.py
+++ b/rhodecode/lib/vcs/utils/paths.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
diff --git a/rhodecode/lib/view_utils.py b/rhodecode/lib/view_utils.py
--- a/rhodecode/lib/view_utils.py
+++ b/rhodecode/lib/view_utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #