diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dbde036b991136e230cae783af302b822a5973a..48a3cecbc7f0f4fcf144d9af5d5ef8b9fa767f4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v2.3.7
+
+* _TBA_
+
 # v2.3.6
 
 * bugfix release - wrong annotation mechanics
diff --git a/satella/__init__.py b/satella/__init__.py
index c27a7106cfc82982063dab0435ca24d9a0206a9f..4f2fd6e5942979085e4ee76ec97be45c99be95df 100644
--- a/satella/__init__.py
+++ b/satella/__init__.py
@@ -1,2 +1 @@
-# coding=UTF-8
-__version__ = '2.3.6'
+__version__ = '2.3.7rc1'
diff --git a/satella/instrumentation/__init__.py b/satella/instrumentation/__init__.py
index dfa68ef098a1a42da4a4e2e52843bd1a67827e94..8273d0987ebd3268d6585d99f3e89ebc63abe56d 100644
--- a/satella/instrumentation/__init__.py
+++ b/satella/instrumentation/__init__.py
@@ -1,11 +1,8 @@
-# coding=UTF-8
 """
 All things related to:
 * post-mortem reporting
 * on-line reporting
 """
-from __future__ import print_function, absolute_import, division
-
 from .dump_frames_on import install_dump_frames_on
 from .trace_back import Traceback, StoredVariableValue, StackFrame, GenerationPolicy
 
diff --git a/setup.py b/setup.py
index c6b07c9ecc4684ea9e4c5d1b76d6dcdae9c06c71..0499463b3c569bf6cfae425432a8d29f3ef288ca 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-# coding=UTF-8
 from setuptools import setup, find_packages
 
 from satella import __version__
diff --git a/tests/test_instrumentation/test_metrics/__init__.py b/tests/test_instrumentation/test_metrics/__init__.py
index a55927c0afe1a888be6c5b1e5cd0c7004279c169..84fe512d14512df1b452958505c7d14109635f23 100644
--- a/tests/test_instrumentation/test_metrics/__init__.py
+++ b/tests/test_instrumentation/test_metrics/__init__.py
@@ -84,7 +84,6 @@ class TestMetric(unittest.TestCase):
 
     def testInheritance(self):
         metric = getMetric('root.test.FloatValue', 'float', INHERIT, enable_timestamp=False)
-        logger.warning('After')
         metric.runtime(2.0)
         metric_parent = getMetric('root.test', enable_timestamp=False)
 
diff --git a/tests/test_posix/hang_until_sig.py b/tests/test_posix/hang_until_sig.py
index 036ab89acf32464a3153fc53885a76d1ad4dd88f..614ac6e4fb369b1a535bcc9bf3eeb754ccd63989 100644
--- a/tests/test_posix/hang_until_sig.py
+++ b/tests/test_posix/hang_until_sig.py
@@ -1,4 +1,3 @@
-# coding=UTF-8
 from satella.posix import hang_until_sig
 
 if __name__ == '__main__':