diff --git a/GaudiConfiguration/python/GaudiConfig2/semantics.py b/GaudiConfiguration/python/GaudiConfig2/semantics.py
index 3160d3c6e7a7ba7532a94f6d2eb2da20ab53c83c..5781fb25fbd7664dcce054cb37c8bf636c90958e 100644
--- a/GaudiConfiguration/python/GaudiConfig2/semantics.py
+++ b/GaudiConfiguration/python/GaudiConfig2/semantics.py
@@ -25,7 +25,7 @@ if sys.version_info >= (3,):  # pragma no cover
     basestring = str
 
 _log = logging.getLogger(__name__)
-is_64bits = sys.maxsize > 2 ** 32
+is_64bits = sys.maxsize > 2**32
 
 
 class PropertySemantics(object):
diff --git a/GaudiConfiguration/tests/nose/test_semantics.py b/GaudiConfiguration/tests/nose/test_semantics.py
index 2bed1073ca7039ef6af23c21d87dece9d168899b..49606a5a426eaf8dd0059259ace99c6562c01a7e 100644
--- a/GaudiConfiguration/tests/nose/test_semantics.py
+++ b/GaudiConfiguration/tests/nose/test_semantics.py
@@ -97,7 +97,7 @@ def test_int_ok():
 
 @raises(ValueError)
 def test_int_bad():
-    getSemanticsFor("int").store(2 ** 32)
+    getSemanticsFor("int").store(2**32)
 
 
 @raises(ValueError)
diff --git a/GaudiKernel/src/Lib/EventIDRange.cpp b/GaudiKernel/src/Lib/EventIDRange.cpp
index b9a6cf2f37e17d6a0540b7fa16e6ec068d4cb713..e2b4ef8b24fcac6ce30c79936f9aa05f095795e2 100644
--- a/GaudiKernel/src/Lib/EventIDRange.cpp
+++ b/GaudiKernel/src/Lib/EventIDRange.cpp
@@ -26,20 +26,7 @@ EventIDRange::EventIDRange()
     , m_stop( EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM,
               EventIDBase::UNDEFNUM, 0 ) {}
 
-EventIDRange::EventIDRange( const EventIDBase& start, const EventIDBase& stop ) : m_start( start ), m_stop( stop ) {
-
-  // For pure time-stamp range, re-adjust start so that it covers O-INF in terms of run-lumi
-  if ( m_start.m_run_number == EventIDBase::UNDEFNUM ) {
-    m_start.m_run_number   = 0;
-    m_start.m_event_number = 0;
-    m_start.m_lumi_block   = 0;
-  }
-  // For pure run/lumi range, re-adjust start so that it covers 0-inf in terms of time-stamp
-  else if ( m_start.m_time_stamp == EventIDBase::UNDEFNUM ) {
-    m_start.m_time_stamp           = 0;
-    m_start.m_time_stamp_ns_offset = 0;
-  }
-}
+EventIDRange::EventIDRange( const EventIDBase& start, const EventIDBase& stop ) : m_start( start ), m_stop( stop ) {}
 
 EventIDRange& EventIDRange::operator=( const EventIDRange& r ) {
   if ( this != &r ) {